]> git.parisson.com Git - telemeta-pages.git/commit
projects / telemeta-pages.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e5d445d ac937a6)
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)
commit9cf89033785575b3792e4c79bc4c1372a7fb867e
tree64a4683e1caab00a15de1178882945795ca1ac47tree | snapshot
parente5d445d3d3367037c52f42f5683d18585cc972cbcommit | diff
parentac937a6b4ce9aef9ba0b8fa3d251696cdfd360cbcommit | diff
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
de/LC_MESSAGES/django.po diff1 | diff2 | blob | history
fr/LC_MESSAGES/django.po diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.