Merge branch 'develop' of github.com:thecodingmachine/workadventure into iframe_api

# Conflicts:
#	front/dist/.gitignore
#	front/dist/index.tmpl.html
#	front/src/Phaser/Game/GameScene.ts
#	front/src/WebRtc/CoWebsiteManager.ts
This commit is contained in:
David Négrier 2021-03-28 16:53:15 +02:00
commit aaaa192b71
46 changed files with 1223 additions and 403 deletions

View file

@ -1,3 +1,4 @@
index.html
index.tmpl.html.tmp
/js/
style.*.css