]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94ed69f 95cf902)
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 5 Dec 2017 13:40:41 +0000 (14:40 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 5 Dec 2017 13:40:41 +0000 (14:40 +0100)
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.