]> git.parisson.com Git - teleforma.git/commit
Merge branch 'prodev' into pro
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 7 Dec 2017 15:18:15 +0000 (16:18 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 7 Dec 2017 15:18:15 +0000 (16:18 +0100)
commitc73fbef6c5b12196fde2815fe282842fc400d217
treec349a34c62a856ca07c25d05ce653d2b8d4449b1
parent831bbfcd0621484e41e8aff1fdcc7d923977f609
parentb57312a5159c9424473409ae81aabdd8d34c535f
Merge branch 'prodev' into pro