From: Yasin Date: Mon, 16 Jun 2014 15:42:57 +0000 (+0200) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.1~64^2~14^2~1^2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f56d47e6dcc591f2c6008205c531ece8eefaccf7;hp=-c;p=unfold.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- f56d47e6dcc591f2c6008205c531ece8eefaccf7 diff --combined portal/templates/fed4fire/fed4fire_widget-topmenu.html index be047e06,1902cd8b..178075d9 --- a/portal/templates/fed4fire/fed4fire_widget-topmenu.html +++ b/portal/templates/fed4fire/fed4fire_widget-topmenu.html @@@ -7,9 -7,9 +7,9 @@@
@@@ -40,6 -40,7 +40,7 @@@ +
  • |