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
..
workflows	Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling	2020-12-11 13:00:11 +01:00