Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Thu, 27 Mar 2014 10:51:28 +0000 (11:51 +0100)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Thu, 27 Mar 2014 10:51:28 +0000 (11:51 +0100)
commitbe718e3336ee7ad98e90b0b3c97b58b37a467788
treefe1c095811318492233972de92d8ccc8968e3a6b
parent5a40dbe074a307538769ae873e446323d6a75f39
parent6a832d61d008d5dd1a41df9fe3f63867e31da79e
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/sliceresourceview.py
portal/templates/slice-resource-view.html