]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into block-person2
authorEmilie <zawadzki@ircam.fr>
Wed, 21 Sep 2016 13:11:39 +0000 (15:11 +0200)
committerEmilie <zawadzki@ircam.fr>
Wed, 21 Sep 2016 13:11:39 +0000 (15:11 +0200)

Trivial merge