]> git.parisson.com Git - mezzo.git/commitdiff
projects / mezzo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76869cb 79e068b)
Merge branch 'dev' into prestashop
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 21 Sep 2016 13:46:09 +0000 (15:46 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 21 Sep 2016 13:46:09 +0000 (15:46 +0200)
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.