]> 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, 8 Nov 2016 17:23:27 +0000 (18:23 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 8 Nov 2016 17:23:27 +0000 (18:23 +0100)

Trivial merge