Merge branch 'master' into feature/login-page
authorgparant <g.parant@thecodingmachine.com>
Wed, 6 May 2020 00:20:28 +0000 (02:20 +0200)
committergparant <g.parant@thecodingmachine.com>
Wed, 6 May 2020 00:20:28 +0000 (02:20 +0200)
commit3ec167ee440f9aa1ac32924bc4ec3b77a1a988ca
tree60e91692ea7c7fcc36788e433cf5a02785fdc17b
parent6a4aca723f3ecd11d8b7ed637741649c2c2626be
parent587caf968cc87bf8bff9fe93a4e405535a57736d
Merge branch 'master' into feature/login-page

# Conflicts:
# front/src/Phaser/Game/GameScene.ts
# front/src/Phaser/Login/LogincScene.ts
front/src/Phaser/Game/GameScene.ts
front/src/Phaser/Login/LogincScene.ts