Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Wed, 12 Mar 2014 18:06:38 +0000 (19:06 +0100)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Wed, 12 Mar 2014 18:06:38 +0000 (19:06 +0100)
commit6818940d6b018d6f5bcad47c2f20d164623b468a
tree3e4283e2caabafa0aefef369e52c3a84cd33193d
parent61f4383785643e8c5a1475f1ccea19f2a3123c68
parent7ae0c099d60e417a77fd8f5fcb8278f087a14d84
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
portal/templates/onelab/onelab_slice-resource-view.html
portal/templates/onelab/onelab_slice-resource-view.html