Merge branch 'refactoring_messages' into feature/login-page
authorgparant <g.parant@thecodingmachine.com>
Tue, 5 May 2020 23:58:04 +0000 (01:58 +0200)
committergparant <g.parant@thecodingmachine.com>
Tue, 5 May 2020 23:58:04 +0000 (01:58 +0200)
commit4e04357b71e730799137821d09aae4660240c317
tree67cb87682314140576f83ea504a9a56e387ef6d5
parent5a6415607d0ea6b5d00271bc37b88869fb0501fd
parent86abdfe30b53baf07e1da56f3ca8fb6056979f61
Merge branch 'refactoring_messages' into feature/login-page

# Conflicts:
# front/src/Phaser/Player/Player.ts
front/src/Phaser/Entity/PlayableCaracter.ts
front/src/Phaser/Player/Player.ts