Merge branch 'develop' into feature/comb

This commit is contained in:
Casper Lamboo 2018-05-02 17:18:54 +02:00
commit 942addf8d7

View File

@ -87,6 +87,7 @@ module.exports = {
title: 'Doodle3D Slicer', title: 'Doodle3D Slicer',
template: require('html-webpack-template'), template: require('html-webpack-template'),
inject: false, inject: false,
hash: !devMode,
appMountId: 'app' appMountId: 'app'
}), }),
new GoogleFontsPlugin({ new GoogleFontsPlugin({