]> git.parisson.com Git - telemeta-pages.git/commit
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)
commit9640be207ec26901b07e8d4867dad38c4ecff4ad
treea49335d6a3f8ff956d381887087383349894588a
parent6cf1395f2ec1784d2f80583ef6a9faa343b5b515
parentf0b2b675e5fc81dadd3cb99ce4e374396a4a8f4d
Merge branch 'dev' into crem

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