]> 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, 31 Aug 2016 13:47:10 +0000 (15:47 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 31 Aug 2016 13:47:10 +0000 (15:47 +0200)

Trivial merge