Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic & Edelberto <loic.baron@lip6.fr>
Wed, 23 Apr 2014 14:03:49 +0000 (11:03 -0300)
committerLoic & Edelberto <loic.baron@lip6.fr>
Wed, 23 Apr 2014 14:03:49 +0000 (11:03 -0300)
commit28bd593d5a6cca6cc6d405dbbdd98ce89b3b4ea2
tree0fda20c3c65890d09359634a79451ae5dba75c1e
parent289fa91a9d049e67c12e96ad8f9fb797ec6f9875
parent00dc99e4482d8f4086e6595ec192855c83a1439a
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
auth/manifoldbackend.py
myslice/settings.py
portal/templates/contact.html
portal/templates/documentationview.html
portal/templates/registration_view.html
setup.py
auth/manifoldbackend.py
myslice/settings.py
myslice/urls.py
portal/actions.py
portal/homeview.py
portal/registrationview.py
portal/templates/fibre/fibre_contact.html
portal/templates/fibre/fibre_documentationview.html
portal/templates/fibre/fibre_registration_view.html
setup.py