]> git.parisson.com Git - diggersdigest.git/commitdiff
projects / diggersdigest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b10bc1c 4facf80)
Merge branch 'master' of git.parisson.com:git/diggersdigest
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 11 May 2016 10:55:34 +0000 (12:55 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 11 May 2016 10:55:34 +0000 (12:55 +0200)
1  2 
app/diggersdigest/local_settings.py patch | diff1 | diff2 | blob | history

diff --cc app/diggersdigest/local_settings.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.