Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 11 Jun 2014 17:06:18 +0000 (19:06 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 11 Jun 2014 17:06:18 +0000 (19:06 +0200)
commit299cc74138342ebb5c10409babe39364f989c7b2
tree798357cb32176b5e03a7edac6e2d920914e3cb6b
parent188051677295c55819d9de9f307d1469bed85cc1
parent9e2d1ca41dd8a9e076ecaff432f8ebe8578ee2c5
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/templates/fed4fire/fed4fire_home-view.html