git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1d7ba6e
eb59dc6
)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
author
Jordan Augé
<jordan.auge@lip6.fr>
Thu, 19 Jun 2014 13:31:32 +0000
(15:31 +0200)
committer
Jordan Augé
<jordan.auge@lip6.fr>
Thu, 19 Jun 2014 13:31:32 +0000
(15:31 +0200)
1
2
portal/templates/slice-resource-view.html
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
portal/templates/slice-resource-view.html
Simple merge
git://git.onelab.eu / myslice.git / commitdiff