]> git.parisson.com Git - mezzo.git/commitdiff
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 27 Oct 2017 12:47:57 +0000 (14:47 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 27 Oct 2017 12:47:57 +0000 (14:47 +0200)

Trivial merge