]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 715171a 3cc3f4a)
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:24:55 +0000 (17:24 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 15 Dec 2014 16:24:55 +0000 (17:24 +0100)
Conflicts:
telemeta/locale
telemeta/locale/de/LC_MESSAGES/django.po


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