Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Mon, 31 Mar 2014 14:25:43 +0000 (16:25 +0200)
committerCiro Scognamiglio <ciro.scognamiglio@cslash.net>
Mon, 31 Mar 2014 14:25:43 +0000 (16:25 +0200)
commit0ea4d9fd262684724c1680c733bd4ea7dfc8df89
tree3818c6b3828ab706d7302432f969d109e28c2bb3
parent05621c49e9b3bb8c2238155d67e01364a1fa5289
parent6693f1969139552e119ca877f6913d7833e3918a
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
portal/templates/slice-resource-view.html