]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca6c47d dea8d69)
Merge branch 'dev'
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 9 Nov 2016 12:00:27 +0000 (13:00 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 9 Nov 2016 12:00:27 +0000 (13:00 +0100)
Conflicts:
app/settings.py


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