]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32e8fce b8a97d1)
Merge remote-tracking branch 'origin' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 10 Jun 2016 15:33:15 +0000 (17:33 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 10 Jun 2016 15:33:15 +0000 (17:33 +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.