]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a3ccf7 7f58807)
Merge branch 'feature/demos' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 17:47:38 +0000 (18:47 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 3 Nov 2016 17:47:38 +0000 (18:47 +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.