Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 16 Apr 2015 13:42:19 +0000 (15:42 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 16 Apr 2015 13:42:19 +0000 (15:42 +0200)
commitce6de45ab6e6935617dc0c49646ef9d95dda25e8
treedabc559d499bf5e6fef73b6c60fbdaec4a9e6f5c
parent7320f5926edc6a76ba0a6c8137d6d3e032545d37
parent1da2bca3b4955efe2a7b3f26a66574ad1d5e9c64
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/templates/fed4fire/fed4fire_home-view.html