]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a4adc8 a27363f)
Merge branch 'dev' into crem
authorThomas Fillon <thomas@parisson.com>
Fri, 2 Jun 2017 16:46:22 +0000 (18:46 +0200)
committerThomas Fillon <thomas@parisson.com>
Fri, 2 Jun 2017 16:46:22 +0000 (18:46 +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.