Gregoire Parant 89e2951c8d Merge branch 'master' into screen-sharing ... # Conflicts: # front/src/WebRtc/SimplePeer.ts		2020-06-08 08:33:23 +02:00
..
MediaManager.ts	Feature screen sharing	2020-06-06 17:03:10 +02:00
SimplePeer.ts	Merge branch 'master' into screen-sharing	2020-06-08 08:33:23 +02:00