]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 19 May 2017 15:34:01 +0000 (17:34 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 19 May 2017 15:34:01 +0000 (17:34 +0200)

Trivial merge