]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem
authoryomguy <yomguy@parisson.com>
Thu, 28 Feb 2013 10:14:33 +0000 (11:14 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 28 Feb 2013 10:14:33 +0000 (11:14 +0100)
commit075ed312c449bf2f87eecda848abb59e78e35752
treee69cfaa1dc876d98f91293bbb95f4c25c2b19531
parentcb119e9c36c12d4c599beda3e8fcf684d777e671
parent892b61ab10df8393bfa6bf52797a5127cac1982f
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/forms/media.py
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
telemeta/views/item.py