Merge branch 'master' into feature/back-players-proximity
authorgparant <g.parant@thecodingmachine.com>
Sun, 26 Apr 2020 21:31:40 +0000 (23:31 +0200)
committergparant <g.parant@thecodingmachine.com>
Sun, 26 Apr 2020 21:31:40 +0000 (23:31 +0200)
commit9730df22959da656e370d7374f77aed575f5de78
tree72f00c119c2438e0d27e9830193ca80777452c5c
parent4bc23ede905b9859be1b4d20bab10cd51aa4cf23
parent33bcbd465013b260233ad9634f1e1cf34738e66a
Merge branch 'master' into feature/back-players-proximity

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