]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam2 lam2
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Jun 2015 14:45:59 +0000 (16:45 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 26 Jun 2015 14:45:59 +0000 (16:45 +0200)
commitf7fb9b763c2fb2e68e87e7a6560d8a16ebefca1c
tree106df4caa5b7ac452f03496bba386f0d7666a8f4
parent4b0d7cfd410194b98f7a1c4d219505331662c707
parent9e7ea951936e65d5b2903c125b9134da807e1d9f
Merge branch 'dev' into lam2
telemeta/templates/telemeta/mediaitem_detail.html