]> git.parisson.com Git - telemeta-pages.git/commit
Merge branch 'dev' into crem
authoryomguy <yomguy@parisson.com>
Thu, 28 Feb 2013 10:14:33 +0000 (11:14 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 28 Feb 2013 10:14:33 +0000 (11:14 +0100)
commitc096698188415e129e0789d17281acd84201ce1a
treec304105afd7291e0bb61e7077ca0bd34cf1bf0f7
parent3efa04752e18c073b00e912fd836b69c61ef714d
parent3290dbbf331bfa12f505256f0743a975371f210f
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
de/LC_MESSAGES/django.mo
de/LC_MESSAGES/django.po
de/LC_MESSAGES/djangojs.mo
de/LC_MESSAGES/djangojs.po
fr/LC_MESSAGES/django.mo
fr/LC_MESSAGES/django.po
fr/LC_MESSAGES/djangojs.mo
fr/LC_MESSAGES/djangojs.po