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

# Conflicts:
#	front/dist/.gitignore
#	front/src/Phaser/Game/GameScene.ts
This commit is contained in:
David Négrier
2021-03-09 15:35:26 +01:00
8 changed files with 79 additions and 10 deletions
+1
View File
@@ -1,2 +1,3 @@
index.html
index.tmpl.html.tmp
/js/