]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d712fe0 99ed991)
resolve conflict with origin to fix merging issues
authorThomas Fillon <thomas@parisson.com>
Mon, 19 Aug 2013 13:40:51 +0000 (15:40 +0200)
committerThomas Fillon <thomas@parisson.com>
Mon, 19 Aug 2013 13:40:51 +0000 (15:40 +0200)

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