Merge branch 'pr/249' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b637535d Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b637535d Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b637535d Branch: refs/heads/two-dot-o-dev Commit: b637535ddeda1a9e74f07619864eace2ba0aca77 Parents: 4116ce5 7e917f4 Author: Shawn Feldman <[email protected]> Authored: Fri May 15 13:50:46 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Fri May 15 13:50:46 2015 -0600 ---------------------------------------------------------------------- portal/config.js | 4 +++- portal/js/global/ug-service.js | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
