]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into lam
authoryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 12:49:43 +0000 (14:49 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 12:49:43 +0000 (14:49 +0200)
commit5647e60ecd7f9ae7422bcba388d3dd1ec9f1de6f
tree84ae0e42331521e51785b8b7868d3106be613215
parent3e38b890e7a6df009988a4694a7f7065e2be61bd
parent1db883ef6829c83cf0b96d55efc76a3646bb2598
Merge branch 'master' into lam

Conflicts:
telemeta/locale/fr/LC_MESSAGES/django.po
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/templates/telemeta/mediaitem_detail.html