]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51e7a24 90e5709)
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:36:05 +0000 (17:36 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:36:05 +0000 (17:36 +0100)

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