]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:09:21 +0000 (18:09 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:09:21 +0000 (18:09 +0200)
commiteae9ad866be3d32560ecd42d45c0b58c6de50e6d
treefc4c4aea1fd04a4dfc61aa87719ae9ad35f75d3c
parentbef4e62b1eced068291d794e12637cd527cbe012
parentdcaf3be856f6729edb97dd0cacdb6329bc048a83
Merge branch 'dev' into lam
telemeta/templates/telemeta/mediaitem_detail.html