Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Wed, 23 Jul 2014 16:13:01 +0000 (13:13 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 23 Jul 2014 16:13:01 +0000 (13:13 -0300)
commitd0e00619b8fe042a1b225fc78a57098ae78b2f4d
tree5ba00bdc102fb09c4efd5c0ee1cb53a1d85b4ec4
parent594732ab461c6a75a8778f41724f4224839b26a6
parent17bbc2c6fd867f157f8c9c5fe30af6b9e7807080
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/registrationview.py
portal/slicerequestview.py
ui/topmenu.py
portal/sliceresourceview.py
portal/templates/slice-tab-users-view.html