Merge branch 'hide-disabled-admins' of https://github.com/michaelarusso/incubator-usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ae6d8112 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ae6d8112 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ae6d8112 Branch: refs/heads/master Commit: ae6d8112f4d6c42c7823ccb865e7c916674208ef Parents: da9e4f6 1fa5d10 Author: GERey <gre...@apigee.com> Authored: Wed Aug 12 14:39:41 2015 -0700 Committer: GERey <gre...@apigee.com> Committed: Wed Aug 12 14:39:41 2015 -0700 ---------------------------------------------------------------------- portal/bower.json | 2 +- portal/js/global/ug-service.js | 16 ++++++++++++++-- portal/package.json | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
