Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 16 Jun 2014 15:42:57 +0000 (17:42 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 16 Jun 2014 15:42:57 +0000 (17:42 +0200)
commitf56d47e6dcc591f2c6008205c531ece8eefaccf7
treeba28478266bc8d46a20ca1e6d8ca8ad18be2a8f8
parent83164968c09d445ea8dc095414e5ce13fff59c99
parent7b8e398d8ecb65b1a860e8651f3d2bf5bbace539
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/templates/fed4fire/fed4fire_widget-topmenu.html