Gregoire Parant 658781e02e Merge branch 'master' into develop ... Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com> # Conflicts: # front/public/resources/logos/meet.svg		2022-02-22 23:40:48 +01:00
..
resources	Merge branch 'master' into develop	2022-02-22 23:40:48 +01:00
static/images	move all static assets to public/	2022-01-31 16:14:34 +01:00
.htaccess	move all static assets to public/	2022-01-31 16:14:34 +01:00
ga.html.tmpl	move all static assets to public/	2022-01-31 16:14:34 +01:00
service-worker-dev.js	move all static assets to public/	2022-01-31 16:14:34 +01:00
service-worker-prod.js	move all static assets to public/	2022-01-31 16:14:34 +01:00