Gregoire Parant 1bff2addf1 Merge branch 'develop' into firefox-error-jitsi ... # Conflicts: # front/src/WebRtc/MediaManager.ts		2020-11-17 18:54:51 +01:00
..
style.css	Merge branch 'develop' into firefox-error-jitsi	2020-11-17 18:54:51 +01:00