]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorEmilie <zawadzki@ircam.fr>
Fri, 25 Nov 2016 18:06:24 +0000 (19:06 +0100)
committerEmilie <zawadzki@ircam.fr>
Fri, 25 Nov 2016 18:06:24 +0000 (19:06 +0100)

Trivial merge