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
2021-03-28 16:53:15 +02:00
parent 07666f6ce2 4b8a2aca34
commit aaaa192b71
46 changed files with 1223 additions and 403 deletions
@@ -1,3 +1,4 @@
 index.html
 index.tmpl.html.tmp
 /js/
+style.*.css