]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 78ce5ad 5e5cd8b)
Merge remote-tracking branch 'origin' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 4 Feb 2016 15:23:47 +0000 (16:23 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 4 Feb 2016 15:23:47 +0000 (16:23 +0100)
1  2 
app/sandbox/settings.py patch | diff1 | diff2 | blob | history

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