]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cb861b 7a395ee)
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 7 Nov 2016 18:14:42 +0000 (19:14 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 7 Nov 2016 18:14:42 +0000 (19:14 +0100)
Conflicts:
app/settings.py


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