]> git.parisson.com Git - mezzo.git/commit
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)
commitfd62c53f787d6e8573eead229d36cc2e2a012a0a
tree3f362adf5e92d33d64664f705e83eb7acea688a3
parent539092602f5318c3d487a0d99556fc3437015ae9
parent39b4f11d3e3e478cf111cc14c46b08499c500b4b
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
app/themes/base/templates/media/live_streaming/live_streaming_detail.html