projects / libreadventure.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a64156 86abdfe)
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)
# Conflicts:
# front/src/Phaser/Player/Player.ts

1  2 
front/src/Phaser/Entity/PlayableCaracter.ts patch | diff1 | diff2 | blob | history
front/src/Phaser/Player/Player.ts patch | diff1 | diff2 | blob | history

diff --cc front/src/Phaser/Player/Player.ts
Simple merge
Unnamed repository; edit this file 'description' to name the repository.