]> git.parisson.com Git - teleforma.git/commitdiff
projects / teleforma.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a119147 d64a867)
Merge remote-tracking branch 'origin/ae' into ae-dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Aug 2018 20:38:30 +0000 (22:38 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 22 Aug 2018 20:38:30 +0000 (22:38 +0200)

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