]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ada102 1b125cd)
Merge branch 'prodev' into pro
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 19 Jan 2018 14:49:35 +0000 (15:49 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 19 Jan 2018 14:49:35 +0000 (15:49 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.