]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e58c52 242c89f)
resolve conflicts
authorEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 15:18:57 +0000 (16:18 +0100)
committerEmilie <zawadzki@ircam.fr>
Fri, 8 Dec 2017 15:18:57 +0000 (16:18 +0100)
1  2 
app/settings.py patch | diff1 | diff2 | blob | history

diff --cc app/settings.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.