]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Mon, 1 Oct 2012 13:07:46 +0000 (15:07 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 1 Oct 2012 13:07:46 +0000 (15:07 +0200)
commit4701f3a1bc1fe3594928cb5c7ebd78321234dbf2
tree376218723249fb83614a1f99e3c1a82d7cf7846e
parent043c6cd6bf939241f51735f9fbdd97178f822d8b
parentdb98590b1b0a847bb4303fd6b9866d062412a9a3
Merge branch 'dev' into lam

Conflicts:
telemeta/templates/telemeta/mediaitem_detail.html
telemeta/views/item.py