Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

author Loic Baron <loic.baron@lip6.fr>

Thu, 24 Jul 2014 09:34:22 +0000 (06:34 -0300)

committer Loic Baron <loic.baron@lip6.fr>

Thu, 24 Jul 2014 09:34:22 +0000 (06:34 -0300)
author Loic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 09:34:22 +0000 (06:34 -0300)
committer Loic Baron <loic.baron@lip6.fr>
Thu, 24 Jul 2014 09:34:22 +0000 (06:34 -0300)
diff --cc manifoldapi/static/js/manifold.js
Simple merge
diff --cc portal/slicerequestview.py
Simple merge
diff --cc portal/templates/slice-resource-view.html
Simple merge
author	Loic Baron <loic.baron@lip6.fr>
	Thu, 24 Jul 2014 09:34:22 +0000 (06:34 -0300)
committer	Loic Baron <loic.baron@lip6.fr>
	Thu, 24 Jul 2014 09:34:22 +0000 (06:34 -0300)
		1	2
manifoldapi/static/js/manifold.js	patch \|	diff1 \|	diff2 \|	blob \| history
portal/slicerequestview.py	patch \|	diff1 \|	diff2 \|	blob \| history
portal/templates/slice-resource-view.html	patch \|	diff1 \|	diff2 \|	blob \| history