]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: baea667 af533a2)
Merge branch 'master' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 18 Apr 2016 09:24:48 +0000 (11:24 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 18 Apr 2016 09:24:48 +0000 (11:24 +0200)
Conflicts:
telemeta/pages


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