You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/08/28 00:16:54 UTC

[5/5] usergrid git commit: Merge commit 'refs/pull/355/head' of github.com:apache/usergrid into two-dot-o-dev

Merge commit 'refs/pull/355/head' of github.com:apache/usergrid into two-dot-o-dev


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/912c78ea
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/912c78ea
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/912c78ea

Branch: refs/heads/two-dot-o-dev
Commit: 912c78ea185c54d1ca8dc070ef9fd92acbc39a2b
Parents: 7f2268d 152541d
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Aug 27 16:16:45 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Aug 27 16:16:45 2015 -0600

----------------------------------------------------------------------
 portal/bower.json                 |  2 +-
 portal/js/data/data-controller.js |  1 -
 portal/js/global/ug-service.js    | 17 +++++++++++------
 portal/package.json               |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------