]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem
authoryomguy <yomguy@parisson.com>
Tue, 8 Jan 2013 08:34:57 +0000 (09:34 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 8 Jan 2013 08:34:57 +0000 (09:34 +0100)
commitdf61db2f1792edb200d68059cf112ff3debfc542
tree9a9dd775d53f204964c294f2c5bddd15d0afa970
parent1d047e7ee683c6efda2af8d6dcc7d924b5f8c628
parent238cdedcdb942fbc99f4c2b8a1626f4d77915bc4
Merge branch 'dev' into crem

Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
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/models/media.py