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
..
characters/pipoya	Adding a huge collection of characters to play with	2020-04-27 22:38:21 +02:00
fonts	Changed font from text	2020-05-01 23:19:51 +02:00
logos	Feature screen sharing	2020-06-06 17:03:10 +02:00
objects	Media webrtcA	2020-05-14 20:39:30 +02:00
style	Merge branch 'master' into fictive-user-screen-sharing	2020-06-11 20:56:03 +02:00