David Négrier aaaa192b71 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
..
Attribution-tilesets.txt
goToPage.json	Popup openWebSite	2021-03-25 17:12:53 +01:00
goToPageScript.js	Popup openWebSite	2021-03-25 17:12:53 +01:00
iframe_api.json
iframe.html
jitsi_config.json
jitsi_custom_url.json
script_api.json
script.js
tileset1.png