Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorPedro, Carlos and Rezende <pedroeusebio, carlos, rezende@land.ufrj.br>
Fri, 3 Oct 2014 19:51:36 +0000 (16:51 -0300)
committerPedro, Carlos and Rezende <pedroeusebio, carlos, rezende@land.ufrj.br>
Fri, 3 Oct 2014 19:51:36 +0000 (16:51 -0300)
commit6a3f5d4949171451d5df2df5d0f96e9eb396f29c
treec8e6390819363e3981b75f00e7b7ff6eee1715e1
parent583c62239bbf6be5222e170609e547349389c1c1
parentdd52272efad5e899f074a3274ef279745c372456
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
manifoldapi/manifoldproxy.py
manifoldapi/static/js/manifold.js
myslice/urls.py
portal/actions.py
portal/emailactivationview.py
portal/homeview.py
portal/managementtabrequests.py
portal/registrationview.py
portal/sliceresourceview.py
portal/templates/email_activation.html
portal/templates/management-tab-requests.html
portal/templates/registration_view.html
portal/templates/slice-resource-view.html
16 files changed:
manifoldapi/static/js/manifold.js
myslice/urls.py
plugins/scheduler2/templates/scheduler.html
portal/actions.py
portal/contactview.py
portal/emailactivationview.py
portal/homeview.py
portal/managementtabrequests.py
portal/registrationview.py
portal/slicerequestview.py
portal/sliceresourceview.py
portal/templates/base.html
portal/templates/email_activation.html
portal/templates/management-tab-requests.html
portal/templates/registration_view.html
portal/templates/slice-resource-view.html