Gregoire Parant 14b4229019 Merge branch 'develop' into GlobalMessageToWorld
# Conflicts:
#	CHANGELOG.md
#	front/src/Api/Events/IframeEvent.ts
#	front/src/Components/App.svelte
#	pusher/src/Services/SocketManager.ts
2021-08-02 23:07:39 +02:00
..
2021-08-02 22:24:00 +02:00
2021-07-23 16:17:53 +02:00
2020-04-11 15:11:22 +02:00
2021-06-23 16:30:42 +02:00
2021-06-23 16:58:57 +02:00
2021-05-17 16:41:10 +02:00