]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'release/1.4.4' into dev
authoryomguy <yomguy@parisson.com>
Fri, 20 Jul 2012 08:50:12 +0000 (10:50 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 20 Jul 2012 08:50:12 +0000 (10:50 +0200)
Conflicts:
telemeta/models/media.py

1  2 
telemeta/models/media.py
telemeta/templates/telemeta/mediaitem_detail.html
telemeta/urls.py

Simple merge
Simple merge