]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:22:25 +0000 (18:22 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:22:25 +0000 (18:22 +0200)
commit0fbad9a0fe7e95d8c046771ac1c00a571d4ea205
tree377636279ec9207183ca0ee0541c6e0d25abf985
parent3c575f0d63ee4377ac790fb4ffdc84c7dc453f33
parented72c7a497f3bbd2e548075048ae14af9af90478
Merge branch 'dev' into lam
telemeta/templates/telemeta/mediaitem_detail.html