projects / libreadventure.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d826668 b391ee2)
Merge pull request #40 from thecodingmachine/kharhamel-interaction
authorgrégoire parant <g.parant@thecodingmachine.com>
Mon, 13 Apr 2020 14:10:09 +0000 (16:10 +0200)
committerGitHub <noreply@github.com>
Mon, 13 Apr 2020 14:10:09 +0000 (16:10 +0200)
conflict interaction @Kharhamel


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.