]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 107cd07 998ee28)
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 29 Jan 2015 22:57:13 +0000 (23:57 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 29 Jan 2015 22:57:13 +0000 (23:57 +0100)
Conflicts:
telemeta/locale


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