]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorEmilie <zawadzki@ircam.fr>
Tue, 5 Dec 2017 17:58:46 +0000 (18:58 +0100)
committerEmilie <zawadzki@ircam.fr>
Tue, 5 Dec 2017 17:58:46 +0000 (18:58 +0100)

Trivial merge