]> git.parisson.com Git - telemeta-locales.git/commit
Merge branch 'dev' of http://vcs.parisson.com/git/telemeta-locales master
authoryomguy <yomguy@parisson.com>
Mon, 19 Nov 2012 16:53:49 +0000 (17:53 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 19 Nov 2012 16:53:49 +0000 (17:53 +0100)
commit66a2d4b513e68700dc188f64baf9ae7f7e51ad5c
treebc20565a5862c0bab5c73d83c22abfcb9e8d1f3c
parentf55d07e8b4e72ce05df31b406ac591c68dcecb55
parent6aa51aa08a174b22a742b8eff1df1859ef1daf92
Merge branch 'dev' of http://vcs.parisson.com/git/telemeta-locales

Conflicts:
fr/LC_MESSAGES/django.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