Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
authorLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 09:34:22 +0000 (06:34 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 09:34:22 +0000 (06:34 -0300)
commit30367685f02279e990cd7830d54b078dfe7c000f
tree3b9d13cae29e1a8befb8a91669574505a078fa52
parent48942c2655e2c2b372772b1b8013bf3ba6f07c77
parentcbb11dd290332ad77d0026bc497ddf340ccb55c8
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre
manifoldapi/static/js/manifold.js
portal/slicerequestview.py
portal/templates/slice-resource-view.html