]> git.parisson.com Git - teleforma.git/commit
Merge branch 'prodev' into pro
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 1 Dec 2017 09:58:43 +0000 (10:58 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 1 Dec 2017 09:58:43 +0000 (10:58 +0100)
commit936417acafe12d0cb650efde777ef2316688abda
tree3dc077536ef31b3f663ee133f62d2ceee08e1341
parent7c9c86b184eea7c5935863ef0b04b0dc5c4136d2
parentf162dc18533875ba53303abb047cc4e2a0c0cf28
Merge branch 'prodev' into pro