David Négrier 6f2c319785 Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling ... # Conflicts: # back/src/Services/SocketManager.ts # deeployer.libsonnet # docker-compose.yaml # front/src/Connexion/RoomConnection.ts # front/src/Enum/EnvironmentVariable.ts # front/src/Phaser/Game/GameScene.ts # front/webpack.config.js # pusher/src/Controller/IoSocketController.ts		2020-12-11 13:00:11 +01:00
..
docs	Adding documentation page regarding editing your own map	2020-07-05 19:08:37 +02:00
static/images	wording changes	2020-11-18 08:40:42 +01:00
choose-map.html	Update website/dist/choose-map.html	2020-11-06 16:46:22 +01:00
create-map.html	Fixing typo in doc	2020-12-02 17:51:59 +01:00
index.html	fix email	2020-11-18 12:21:42 +01:00