]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ec1a4a 343ea4b)
Merge branch 'crem' of https://github.com/Parisson/Telemeta into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 17 Sep 2017 23:35:26 +0000 (01:35 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 17 Sep 2017 23:35:26 +0000 (01:35 +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.