]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f8db706 f822169)
Merge branch 'master' of github.com:Ircam-Web/Mezzo
authorEmilie <zawadzki@ircam.fr>
Wed, 18 Apr 2018 08:49:58 +0000 (10:49 +0200)
committerEmilie <zawadzki@ircam.fr>
Wed, 18 Apr 2018 08:49:58 +0000 (10:49 +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.