]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev'
authorEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 12:12:33 +0000 (13:12 +0100)
committerEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 12:12:33 +0000 (13:12 +0100)

Trivial merge