git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7320f59
1da2bca
)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
author
Loic Baron
<loic.baron@lip6.fr>
Thu, 16 Apr 2015 13:42:19 +0000
(15:42 +0200)
committer
Loic Baron
<loic.baron@lip6.fr>
Thu, 16 Apr 2015 13:42:19 +0000
(15:42 +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
git://git.onelab.eu / myslice.git / commitdiff