]> 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, 29 Sep 2016 16:05:09 +0000 (18:05 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 29 Sep 2016 16:05:09 +0000 (18:05 +0200)

Trivial merge