Merge branch 'master' into webrtc

# Conflicts: # back/src/Model/Websocket/MessageUserPosition.ts
2020-04-29 00:05:16 +02:00 · 2020-04-29 00:05:16 +02:00 · 3151113db3
commit 3151113db3
parent 4e556782af 8d784008b8
303 changed files with 12 additions and 6 deletions
--- a/back/src/Model/Websocket/MessageUserPosition.ts
+++ b/back/src/Model/Websocket/MessageUserPosition.ts
@ -41,4 +41,4 @@ export class MessageUserPosition extends Message{
                })
        );
    }
-}
+}