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
..
AuthenticateController.ts	Adding a Pusher container as a middleware/dispatcher between front and back	2020-11-26 17:53:30 +01:00
BaseController.ts	Adding a Pusher container as a middleware/dispatcher between front and back	2020-11-26 17:53:30 +01:00
DebugController.ts	Adding a Pusher container as a middleware/dispatcher between front and back	2020-11-26 17:53:30 +01:00
IoSocketController.ts	Reimplementing ban/unban/messages	2020-12-11 12:23:50 +01:00
MapController.ts	Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling	2020-12-11 13:00:11 +01:00
PrometheusController.ts	Adding a Pusher container as a middleware/dispatcher between front and back	2020-11-26 17:53:30 +01:00