]> git.parisson.com Git - telemeta-pages.git/commitdiff
projects / telemeta-pages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
de/LC_MESSAGES/django.po patch | diff1 | diff2 | blob | history
fr/LC_MESSAGES/django.po patch | diff1 | diff2 | blob | history

diff --cc de/LC_MESSAGES/django.po
Simple merge
diff --cc fr/LC_MESSAGES/django.po
Simple merge
Unnamed repository; edit this file 'description' to name the repository.