]> git.parisson.com Git - telemeta.git/commit
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)
commit73ec04eae4a2e3d194e1eacf3e21b4c15139b33b
tree9d683fa77dacc312bfb10c3d608e4e46067cd920
parent7ce214bac1ab81f8e8e1a0d46074c174ef9b80b7
parent1d503bb6b43d2ad285239e937ede919aabaa07cf
Merge branch 'release/1.4.4' into dev

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