]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8af428 b4cb28a)
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 17:37:15 +0000 (18:37 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 3 Mar 2014 17:37:15 +0000 (18:37 +0100)

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