]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9c717d 50478c9)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 13:20:14 +0000 (14:20 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 14:00:56 +0000 (15:00 +0100)
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.