]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f70f19a 970a396)
Merge branch 'dj1.6' of github.com:yomguy/Telemeta into dj1.6
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Nov 2014 21:09:18 +0000 (22:09 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Nov 2014 21:09:18 +0000 (22:09 +0100)

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