git://git.onelab.eu
/
unfold.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1880516
9e2d1ca
)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
author
Yasin
<mohammed-yasin.rahman@lip6.fr>
Wed, 11 Jun 2014 17:06:18 +0000
(19:06 +0200)
committer
Yasin
<mohammed-yasin.rahman@lip6.fr>
Wed, 11 Jun 2014 17:06:18 +0000
(19:06 +0200)
1
2
portal/templates/fed4fire/fed4fire_home-view.html
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
portal/templates/fed4fire/fed4fire_home-view.html
Simple merge