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:
commit
ed2ce68f37
8 changed files with 79 additions and 10 deletions
1
front/dist/.gitignore
vendored
1
front/dist/.gitignore
vendored
|
@ -1,2 +1,3 @@
|
|||
index.html
|
||||
index.tmpl.html.tmp
|
||||
/js/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue