From: Loic Baron Date: Fri, 25 Jul 2014 18:23:57 +0000 (-0300) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=89da9de59d588949015f461ceabfb6e0374467fe;p=myslice.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre --- 89da9de59d588949015f461ceabfb6e0374467fe diff --cc portal/templates/slice-tab-users-view.html index 04473d58,82acd013..74fadebe --- a/portal/templates/slice-tab-users-view.html +++ b/portal/templates/slice-tab-users-view.html @@@ -4,8 -4,12 +4,11 @@@