]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71f04af 76197f7)
Merge branch 'dev' into feature/dj1.8
authorThomas Fillon <thomas@parisson.com>
Mon, 16 Jan 2017 09:41:24 +0000 (10:41 +0100)
committerThomas Fillon <thomas@parisson.com>
Mon, 16 Jan 2017 09:41:24 +0000 (10:41 +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.