]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
authorEmilie <zawadzki@ircam.fr>
Wed, 15 Mar 2017 13:33:28 +0000 (14:33 +0100)
committerEmilie <zawadzki@ircam.fr>
Wed, 15 Mar 2017 13:33:28 +0000 (14:33 +0100)
1  2 
app/themes/base/templates/media/live_streaming/live_streaming_detail.html