]> git.parisson.com Git - teleforma.git/commit
Merge branch 'prodev' into pro
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 26 Dec 2018 11:19:41 +0000 (12:19 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 26 Dec 2018 11:19:41 +0000 (12:19 +0100)
commit3c988e3167236463d138a1b1e0514820aafc9b56
tree353b06e2b11e05dffb30d6fc3ef790349d801274
parentf6fb4804dc0e54e6cc98bb2556ee496600eef46e
parentb8b5e1b0b0631e7905d507823184c7e0e34dfbb3
Merge branch 'prodev' into pro