git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2ced2e2
03dfe4e
)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
author
Loic Baron
<loic.baron@lip6.fr>
Fri, 21 Feb 2014 13:30:30 +0000
(14:30 +0100)
committer
Loic Baron
<loic.baron@lip6.fr>
Fri, 21 Feb 2014 13:30:30 +0000
(14:30 +0100)
1
2
portal/urls.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
portal/urls.py
Simple merge