git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ca0fa82
0f2ff6b
)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
author
Yasin Rahman
<loic.baron@lip6.fr>
Tue, 12 May 2015 13:10:33 +0000
(15:10 +0200)
committer
Yasin Rahman
<loic.baron@lip6.fr>
Tue, 12 May 2015 13:10:33 +0000
(15:10 +0200)
1
2
myslice/settings.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
myslice/settings.py
Simple merge