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
..
resources	Merge branch 'master' into fictive-user-screen-sharing	2020-06-11 20:56:03 +02:00
static/images	Porting favicon to the "front" container	2020-06-09 09:21:24 +02:00
.htaccess	Fixing htaccess redirect	2020-05-13 09:29:18 +02:00
index.html	Merge branch 'master' into fictive-user-screen-sharing	2020-06-11 20:56:03 +02:00