]> git.parisson.com Git - telemeta.git/commit
Merge branch 'develop' into lam
authoryomguy <yomguy@parisson.com>
Sun, 27 May 2012 17:24:28 +0000 (19:24 +0200)
committeryomguy <yomguy@parisson.com>
Sun, 27 May 2012 17:24:28 +0000 (19:24 +0200)
commita7f10c19d3d7d4da68a3ae5b874200178f6950d1
tree7812edfaa5b2bec30a91cda0966c1873822e31d3
parent9ac0d412f7545895edbe915211d5a6d8cdb9b837
parent4e5ae69cfa11f27b29afec9c63efdd917f0d4a32
Merge branch 'develop' into lam

Conflicts:
telemeta/templates/telemeta/mediaitem_detail.html
telemeta/__init__.py
telemeta/templates/telemeta/mediaitem_detail.html