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

..

WarningContainer.svelte

Merge branch 'master' into develop

2022-02-22 23:40:48 +01:00