]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0f08f0 ea2ec0f)
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 10:42:37 +0000 (12:42 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 13 Apr 2016 10:42:37 +0000 (12:42 +0200)
Conflicts:
app/festival/static/css/index.css


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