]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'pro' of git.parisson.com:git/teleforma into pro
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 7 Jan 2019 21:50:45 +0000 (22:50 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 7 Jan 2019 21:50:45 +0000 (22:50 +0100)

Trivial merge