]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam2
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 27 Apr 2015 14:45:07 +0000 (16:45 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 27 Apr 2015 14:45:07 +0000 (16:45 +0200)
commit10df4952f547bd64abb44920910f336d723636db
treee394afcf500bbe341cb8e4af9eb487a3a75d4e42
parent5b51b3bd8d9a724c4faf107c31edbe26a88b4eb4
parent4ce873519770d3be69eb321c9b575f984e82ebc4
Merge branch 'dev' into lam2
telemeta/templates/telemeta/mediaitem_detail.html