]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 10:49:58 +0000 (12:49 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 10:49:58 +0000 (12:49 +0200)
commit30c818508389d8311913a1dedab2dd18cd00c726
treeb5b3383fdf9d8ed93c0582f70c1854f17c18f3ff
parent3009388c3967ff12b7cab0b972a315c54fc92784
parent16bbd97ec6cad284d56dfe5f1dabf19228f79d48
Merge branch 'dev' into lam
telemeta/templates/telemeta/mediaitem_detail.html