]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb1fc9a 9e33f93)
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 19 Mar 2014 21:36:50 +0000 (22:36 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 19 Mar 2014 21:36:50 +0000 (22:36 +0100)

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