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)
Conflicts:
portal/templates/fed4fire/fed4fire_home-view.html


No differences found