Gregoire Parant 2fcb8a76b1 Merge branch 'master' into develop ... # Conflicts: # front/src/Connexion/RoomConnection.ts # front/src/Phaser/Menu/ReportMenu.ts		2021-03-11 02:22:05 +01:00
..
Controller	Merge branch 'master' into develop	2021-03-11 02:22:05 +01:00
Enum	Removed unused URL_ROOM_STARTED variable from pusher and back	2021-01-20 22:56:24 +01:00
Messages	Adding a Pusher container as a middleware/dispatcher between front and back	2020-11-26 17:53:30 +01:00
Model	FEATURE: the connexion error an user can get when a world is full is now correctly traited. Also remove a redundant adminApi call	2021-03-09 16:34:19 +01:00
Server	Adding a Pusher container as a middleware/dispatcher between front and back	2020-11-26 17:53:30 +01:00
Services	Merge branch 'master' into develop	2021-03-11 02:22:05 +01:00
App.ts	FEATURE: better implementation of the admin global message	2021-03-04 16:18:06 +01:00