Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 16 Apr 2015 11:25:16 +0000 (13:25 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 16 Apr 2015 11:25:16 +0000 (13:25 +0200)
commit4b4122444bd057772e6a408bdcf46d54ce064f96
tree6062cb3518ed5071d292c1af4e0bbe7be33cc60d
parent4965380e7c719de6027a04afc58b9a79242e9a61
parent47875c18877f9c482861cdede4832b94f13a11c3
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
portal/templates/fed4fire/fed4fire_home-view.html
portal/actions.py
portal/templates/fed4fire/fed4fire_home-view.html