]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'master' of git.parisson.com:git/teleforma
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 5 Jul 2018 15:15:53 +0000 (17:15 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 5 Jul 2018 15:15:53 +0000 (17:15 +0200)

Trivial merge