]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6534b95 b2fb16a)
Merge branch 'feature/ts-0.5' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 21:53:43 +0000 (22:53 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 21:53:43 +0000 (22:53 +0100)

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