]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3432be9 2512108)
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 26 Jan 2017 14:57:43 +0000 (15:57 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 26 Jan 2017 14:57:43 +0000 (15:57 +0100)
Conflicts:
docker-compose.yml
lib/mezzanine-agenda
var

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.