]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5663048 e7728cf)
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Jun 2014 15:28:21 +0000 (17:28 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 4 Jun 2014 15:28:21 +0000 (17:28 +0200)

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