]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b251e5 2b094e6)
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 23 Sep 2016 10:53:01 +0000 (12:53 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 23 Sep 2016 10:53:01 +0000 (12:53 +0200)
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.