David Négrier d3fa901691 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/global-message ... + migrating to protobuf messages # Conflicts: # back/src/App.ts # back/src/Controller/IoSocketController.ts # back/yarn.lock # front/src/Connection.ts # front/src/Phaser/Game/GameScene.ts # front/src/Phaser/Login/EnableCameraScene.ts # front/src/WebRtc/SimplePeer.ts		2020-10-01 14:11:34 +02:00
..
server	Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature/global-message	2020-10-01 14:11:34 +02:00
sifrr.server.ts	Cleanup	2020-09-29 10:57:14 +02:00