Merge branch 'master' into data-source-settings-to-react

2018-11-07 09:50:17 +01:00
parent ffc06e9962 b28b79100a
commit e25b2d0ab6
79 changed files with 1091 additions and 394 deletions
@@ -83,7 +83,7 @@ module.exports = merge(common, {
    new CleanWebpackPlugin('../public/build', { allowExternal: true }),
    new HtmlWebpackPlugin({
      filename: path.resolve(__dirname, '../../public/views/index.html'),
-      template: path.resolve(__dirname, '../../public/views/index.template.html'),
+      template: path.resolve(__dirname, '../../public/views/index-template.html'),
      inject: 'body',
      alwaysWriteToDisk: true,
    }),