git://git.onelab.eu / unfold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ab3949 a7a8b48)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Tue, 25 Feb 2014 18:06:48 +0000 (19:06 +0100)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Tue, 25 Feb 2014 18:06:48 +0000 (19:06 +0100)
1  2 
myslice/settings.py patch | diff1 | diff2 | blob | history

diff --cc myslice/settings.py
Simple merge
myslice (django)