]> git.parisson.com Git - teleforma.git/commit
Merge branch 'master' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 26 Jan 2018 08:45:32 +0000 (09:45 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 26 Jan 2018 08:45:32 +0000 (09:45 +0100)
commit25f957d7bdf69984e6bbf6d2d5ce205f7c843cc0
tree1c7546c9e4eda4289dc1aad5b764f876e48c9fd6
parentf30a0ba635244f7c9e8dbe7f435b8c9316f351cb
parente60ee8dc58d018eac9d1f238883676f4803eb7aa
Merge branch 'master' into dev