Merge branch 'FTUEPopup' of github.com:ClementVieilly75/workadventure into iframe_api

# Conflicts: # front/dist/.gitignore # front/src/Phaser/Game/GameScene.ts
2021-03-09 15:35:26 +01:00 · 2021-03-09 15:35:26 +01:00 · ed2ce68f37
commit ed2ce68f37
parent 2bef328d8a bbf5003e16
8 changed files with 79 additions and 10 deletions
--- a/front/webpack.config.js
+++ b/front/webpack.config.js
@ -46,7 +46,7 @@ module.exports = {
    plugins: [
        new HtmlWebpackPlugin(
            {
-                template: './dist/index.tmpl.html',
+                template: './dist/index.tmpl.html.tmp',
                minify: {
                    collapseWhitespace: true,
                    keepClosingSlash: true,