]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a38a48 037bf2f)
Merge branch 'dev' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 21 Feb 2014 16:45:19 +0000 (17:45 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 21 Feb 2014 16:45:19 +0000 (17:45 +0100)
1  2 
example/sandbox/settings.py patch | diff1 | diff2 | blob | history

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