]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:11:05 +0000 (18:11 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:11:05 +0000 (18:11 +0200)
commit3c575f0d63ee4377ac790fb4ffdc84c7dc453f33
tree8f497ee2470928146bc5a9ce3ac1bfb12fb80c66
parenteae9ad866be3d32560ecd42d45c0b58c6de50e6d
parent223daaf7adf937bd80e280cc8f64b020b6ade5db
Merge branch 'dev' into lam
telemeta/templates/telemeta/mediaitem_detail.html