Commit Graph

4 Commits

Author SHA1 Message Date
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
Gregoire Parant 3541f153fa Push Jitsi icon
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-22 23:37:28 +01:00
Lukas Hass 29cdb1a8e5 Merge branch 'develop' into vite 2022-02-13 11:46:26 +01:00
Lukas Hass 590e16ff8a move all static assets to public/ 2022-01-31 16:14:34 +01:00