]> 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>
Thu, 22 Dec 2016 11:52:36 +0000 (12:52 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 22 Dec 2016 11:52:36 +0000 (12:52 +0100)

Trivial merge