Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorPedro, Carlos and Rezende <pedroeusebio, carlos, rezende@land.ufrj.br>
Fri, 24 Oct 2014 18:00:22 +0000 (16:00 -0200)
committerPedro, Carlos and Rezende <pedroeusebio, carlos, rezende@land.ufrj.br>
Fri, 24 Oct 2014 18:00:22 +0000 (16:00 -0200)
commitd9c4cf9cd7f3269068e048563b2975d26af2ae70
tree0ebb83c5596ed38c36905cf5acf6fbc93ffd1cc9
parent9684bf9151df4050813361ab4816e9c07a1ba08d
parentaad516bfc9396270961493b33a875f7cd2a3f941
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/homeview.py
portal/sliceresourceview.py
portal/templates/slice-resource-view.html
manifoldapi/static/js/manifold.js
portal/actions.py
portal/homeview.py
portal/templates/fibre/fibre_home-view.html
portal/templates/fibre/fibre_slice-resource-view.html
portal/templates/slice-resource-view.html