]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 11 Oct 2016 15:42:25 +0000 (17:42 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 11 Oct 2016 15:42:25 +0000 (17:42 +0200)

Trivial merge