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

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