]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Thu, 7 Jun 2012 08:14:49 +0000 (10:14 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 7 Jun 2012 08:14:49 +0000 (10:14 +0200)
Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.mo

1  2 
telemeta/locale/fr/LC_MESSAGES/django.po