]> 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>
Wed, 21 Sep 2016 17:22:22 +0000 (19:22 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 21 Sep 2016 17:22:22 +0000 (19:22 +0200)

Trivial merge