]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67c2ae3 9f9c3cd)
Merge branch 'dev' into feature/epub
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 24 Feb 2015 22:41:22 +0000 (23:41 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 24 Feb 2015 22:41:22 +0000 (23:41 +0100)

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