]> git.parisson.com Git - telemeta-pages.git/commitdiff
projects / telemeta-pages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cf1395 f0b2b67)
Merge branch 'dev' into crem
authoryomguy <yomguy@parisson.com>
Tue, 8 Jan 2013 08:34:57 +0000 (09:34 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 8 Jan 2013 08:34:57 +0000 (09:34 +0100)
Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.mo


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