Merge branch 'master' into webrtc
authorgparant <g.parant@thecodingmachine.com>
Tue, 28 Apr 2020 18:50:51 +0000 (20:50 +0200)
committergparant <g.parant@thecodingmachine.com>
Tue, 28 Apr 2020 18:50:51 +0000 (20:50 +0200)
commit8c935e8b27b528171e97990445d60d0b92296f2d
treed80babf4c68eba37c186f49e1d663c29916a6738
parent881bb04eb04002dc306fbc5c1c5c4ff3cd639bc3
parentcdd18fd5ac01fd62e549b033d1b0bdefd8fffeeb
Merge branch 'master' into webrtc

# Conflicts:
# front/src/Phaser/Game/GameManager.ts
front/src/Phaser/Game/GameManager.ts
front/src/Phaser/Game/GameScene.ts