Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Mon, 16 Jun 2014 15:45:18 +0000 (10:45 -0500)
committerLoic Baron <loic.baron@lip6.fr>
Mon, 16 Jun 2014 15:45:18 +0000 (10:45 -0500)
commit505a38cbeb3714eb8d2b54c55c1310a890ebdbd7
tree3018c599842fa7528b9b906babd4a46459a1a5c3
parentd3214a4ed3b9725c704b48c74fddb27eeb165460
parentf56d47e6dcc591f2c6008205c531ece8eefaccf7
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/templates/fed4fire/fed4fire_widget-topmenu.html