]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95f6a3f e400fce)
Merge branch 'prodev' into pro
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sat, 24 Mar 2018 18:24:51 +0000 (19:24 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Sat, 24 Mar 2018 18:24:51 +0000 (19:24 +0100)

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