Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 21 Jan 2015 17:31:54 +0000 (18:31 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 21 Jan 2015 17:31:54 +0000 (18:31 +0100)
commit5826537e8d4519f35cdb55769794c95edef7e3dc
tree5febea76a9635670b0639267027d6ea2d2781381
parent67dd0c2e73f832813a1b51390264191a49a643f0
parent79e2722a381b3d6d7e3d00fa0de95eeaa4503f24
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/templates/fed4fire/fed4fire_home-view.html