Gregoire Parant 4a843fea77 Merge branch 'master' into fictive-user-screen-sharing ... # Conflicts: # front/dist/resources/style/style.css		2020-06-11 20:56:03 +02:00
..
style.css	Merge branch 'master' into fictive-user-screen-sharing	2020-06-11 20:56:03 +02:00