git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d5f4c4f
a01625f
)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
author
Loic Baron
<loic.baron@lip6.fr>
Thu, 24 Jul 2014 16:11:24 +0000
(18:11 +0200)
committer
Loic Baron
<loic.baron@lip6.fr>
Thu, 24 Jul 2014 16:11:24 +0000
(18:11 +0200)
1
2
portal/actions.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
portal/actions.py
Simple merge