]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' of git.parisson.com:git/teleforma into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 13 Nov 2017 14:44:29 +0000 (15:44 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 13 Nov 2017 14:44:29 +0000 (15:44 +0100)

Trivial merge