]> git.parisson.com Git - telemeta.git/commit
Merge branch 'release/1.4.4' into lam
authoryomguy <yomguy@parisson.com>
Thu, 31 May 2012 23:28:48 +0000 (01:28 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 31 May 2012 23:28:48 +0000 (01:28 +0200)
commit4cc87cba9f6da44050ddf00aeab533fcef89cf31
treeda2ffbc8f88f700769eddf3b3d642e5de5e404db
parent55f79a8c4baf06972e7142da0f0b8f6ffad99cf7
parent1d503bb6b43d2ad285239e937ede919aabaa07cf
Merge branch 'release/1.4.4' into lam

Conflicts:
telemeta/templates/telemeta/mediaitem_detail.html
telemeta/models/media.py
telemeta/templates/telemeta/mediaitem_detail.html