Gregoire Parant 3a3e5d5f3b Merge branch 'master' into develop
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Components/Menu/Menu.svelte
#	front/src/Components/Menu/ProfileSubMenu.svelte
#	front/src/Components/Menu/SettingsSubMenu.svelte
#	front/src/Connexion/ConnectionManager.ts
#	front/src/Stores/MediaStore.ts
#	front/src/Stores/MenuStore.ts
#	front/style/TextGlobalMessageSvelte-Style.scss
#	front/style/style.scss
2021-09-08 18:20:13 +02:00
..
2021-09-08 18:20:13 +02:00
2021-09-08 18:20:13 +02:00
2020-04-11 15:11:22 +02:00
2021-06-23 16:30:42 +02:00
2021-05-17 16:41:10 +02:00
2021-09-05 19:51:33 +02:00
2021-09-05 19:51:33 +02:00