Merge remote-tracking branch 'github.com/master' into webrtc
authorgparant <g.parant@thecodingmachine.com>
Fri, 1 May 2020 22:36:04 +0000 (00:36 +0200)
committergparant <g.parant@thecodingmachine.com>
Fri, 1 May 2020 22:36:04 +0000 (00:36 +0200)
commitaff77fe074e5bda9c9fe5ecdc01a6371a682cc7d
tree20dda2a2a38c9ec612bba5bf75b583c16981807d
parentc7f8f92e85e6c445b9c6e64d18d55643a6150cad
parentd2f94e94064d50e0335d6686077dd0f8d61a0c7c
Merge remote-tracking branch 'github.com/master' into webrtc

# Conflicts:
# back/src/Model/Group.ts
# back/src/Model/World.ts
back/src/Model/Group.ts
back/src/Model/World.ts
front/src/Phaser/Player/Player.ts