]> git.parisson.com Git - telemeta.git/commit
Merge branch 'hotfix/registration' into dev
authoryomguy <yomguy@parisson.com>
Sun, 8 Jul 2012 23:20:40 +0000 (01:20 +0200)
committeryomguy <yomguy@parisson.com>
Sun, 8 Jul 2012 23:20:40 +0000 (01:20 +0200)
commit5a2b932812553ef2c7ceed57a7e98abdf09f7521
tree6e350c68d8b48471b8231046e579c74ed5848a3d
parentf6bc1e03a048bc18732dc0fa49b0dff6640f49b6
parent8d83c06762c4208f822c1b5ed9482aea3f75f137
Merge branch 'hotfix/registration' into dev

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/django.po
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.po
telemeta/locale/de/LC_MESSAGES/django.po
telemeta/locale/fr/LC_MESSAGES/django.po