Merge branch 'master' into webrtc
authorgparant <g.parant@thecodingmachine.com>
Tue, 28 Apr 2020 22:05:16 +0000 (00:05 +0200)
committergparant <g.parant@thecodingmachine.com>
Tue, 28 Apr 2020 22:05:16 +0000 (00:05 +0200)
commit3151113db3b5b0b579f8fd1a40a214eedb8c102e
tree67663adef96b1ea60545282a2c161a64b1640880
parent4e556782af8999e2bf997a54b2dced5c0a4ab4f5
parent8d784008b84eae65240b0f2f1b2ae4742f337d97
Merge branch 'master' into webrtc

# Conflicts:
# back/src/Model/Websocket/MessageUserPosition.ts
back/src/Model/Websocket/MessageUserPosition.ts