Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Fri, 25 Jul 2014 18:22:38 +0000 (15:22 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 25 Jul 2014 18:22:38 +0000 (15:22 -0300)
commit5ae4f6ec1b8941fc571ca61a396eb72fafe40e1f
tree5c92d5d08ad5dd7752fd8968ba261e970a20067e
parent6891134719af440a27636545c3babfcb5ccf3d5c
parentaf8400d08628917ac20abca26801a8666eaaff9e
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
portal/homeview.py
manifoldapi/static/js/manifold.js
myslice/urls.py
plugins/scheduler2/templates/scheduler.html
portal/actions.py
portal/homeview.py
portal/slicerequestview.py
portal/templates/base.html
portal/templates/slice-tab-users-view.html