]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95292ee 3077150)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into search
authorEmilie <zawadzki@ircam.fr>
Thu, 13 Oct 2016 08:17:19 +0000 (10:17 +0200)
committerEmilie <zawadzki@ircam.fr>
Thu, 13 Oct 2016 08:17:19 +0000 (10:17 +0200)
1  2 
app/local_settings.py patch | diff1 | diff2 | blob | history

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