David Négrier 9f3577286d Merge branch 'develop' of github.com:thecodingmachine/workadventure into uws ... # Conflicts: # back/src/Controller/AdminController.ts # back/src/Controller/AuthenticateController.ts # back/src/Controller/IoSocketController.ts # back/src/Controller/MapController.ts # benchmark/index.ts # front/src/Connexion/RoomConnection.ts		2020-09-29 17:12:28 +02:00
..
ConnectionManager.ts	Merge branch 'develop' of github.com:thecodingmachine/workadventure into uws	2020-09-29 17:12:28 +02:00
ConnexionModels.ts	rewrote the login workflow	2020-09-25 19:23:33 +02:00
RoomConnection.ts	Merge branch 'develop' of github.com:thecodingmachine/workadventure into uws	2020-09-29 17:12:28 +02:00