git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 531af23 bcbf670)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 17 Dec 2014 10:46:51 +0000 (11:46 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 17 Dec 2014 10:46:51 +0000 (11:46 +0100)
Conflicts:
myslice/settings.py

1  2 
myslice/settings.py patch | diff1 | diff2 | blob | history
myslice/urls.py patch | diff1 | diff2 | blob | history

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