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
..
CoWebsiteManager.ts	Adding Jitsi meet support	2020-08-31 12:18:00 +02:00
HtmlUtils.ts	Adding LayoutManager to position videos as cleverly as possible	2020-08-11 22:32:55 +02:00
LayoutManager.ts	Centering character based on game div	2020-08-31 17:56:11 +02:00
MediaManager.ts	Migrating userId to "int32" to save some space and adding userMoves message in protobuf	2020-09-18 13:57:38 +02:00
ScreenSharingPeer.ts	rewrote the login workflow	2020-09-25 19:23:33 +02:00
SimplePeer.ts	Merge branch 'develop' of github.com:thecodingmachine/workadventure into uws	2020-09-29 17:12:28 +02:00
VideoPeer.ts	rewrote the login workflow	2020-09-25 19:23:33 +02:00