]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem
authoryomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 10:51:34 +0000 (12:51 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 10:51:34 +0000 (12:51 +0200)
commitecd6f3e4c44c93fd17b8c7efe75eb6c35990d1c8
tree0427f7283a23a246012bf346a5c8cff5aa6236be
parentf19ddb42ed8153621a05fb7e52235654c186fffb
parent16bbd97ec6cad284d56dfe5f1dabf19228f79d48
Merge branch 'dev' into crem
telemeta/templates/telemeta/mediaitem_detail.html