]> git.parisson.com Git - mezzo.git/commit
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into media-related-object
authorEmilie <zawadzki@ircam.fr>
Thu, 3 Nov 2016 10:58:59 +0000 (11:58 +0100)
committerEmilie <zawadzki@ircam.fr>
Thu, 3 Nov 2016 10:58:59 +0000 (11:58 +0100)
commit9e48937d8c7a76bc4a68803632704c275fcb7364
tree326d31d1528125e5fd5e494e32c43fcdb66fc5bb
parent4821d5e49ddad6ac57959970250c036a34825680
parent0b7316c7272d04039823a9d8275e6250e2c880b2
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into media-related-object
app/templates/magazine/topic/topic_detail.html