]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/ts-server
authorThomas Fillon <thomas@parisson.com>
Wed, 13 Apr 2016 17:01:25 +0000 (19:01 +0200)
committerThomas Fillon <thomas@parisson.com>
Wed, 13 Apr 2016 17:01:25 +0000 (19:01 +0200)
commitb1453079840cb3c0ae9a303fc464ab04d55af86b
treef5753e2b4f187af0c1fdcf3a4191fc69abfc971d
parent154c5849ef20378ea6e493fbb82f204f999a8a5d
parent5b462168f6007bde238d94b7b4ea445a2f70123b
Merge branch 'dev' into feature/ts-server
telemeta/templates/telemeta/mediaitem_detail.html