]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:43:32 +0000 (18:43 +0200)
committeryomguy <yomguy@parisson.com>
Mon, 17 Sep 2012 16:43:32 +0000 (18:43 +0200)
commitfba0860b31f5fce7caf9e5120891b43b0d99fcb6
treeba62cb60f4ce7fbfc9b59e99bfeae1d93123e8cc
parent0fbad9a0fe7e95d8c046771ac1c00a571d4ea205
parent09b666a82fb89ab25d1bf9c6b0050b7793d35f3e
Merge branch 'dev' into lam
telemeta/templates/telemeta/mediaitem_detail.html