]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c703616 235a089)
Merge branch 'feature/box' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 26 Jan 2018 08:38:50 +0000 (09:38 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 26 Jan 2018 08:38:50 +0000 (09:38 +0100)

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