]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25f957d e6a2a14)
Merge branch 'master' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 1 Feb 2018 11:53:08 +0000 (12:53 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 1 Feb 2018 11:53:08 +0000 (12:53 +0100)

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