]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c73fbef 3c77780)
Merge remote-tracking branch 'origin/prodev' into pro
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 7 Dec 2017 16:49:33 +0000 (17:49 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 7 Dec 2017 16:49:33 +0000 (17:49 +0100)

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