You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/12/16 15:59:37 UTC

[07/50] incubator-usergrid git commit: Merge branch 'two-dot-o' into two-dot-o-events

Merge branch 'two-dot-o' into two-dot-o-events


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

Branch: refs/heads/no-source-in-es
Commit: ac03027c0695eca8f955fa787f3f07842ac0b727
Parents: ec0d69a 0bfca7e
Author: Dave Johnson <dm...@apigee.com>
Authored: Thu Oct 30 09:50:57 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Thu Oct 30 09:50:57 2014 -0400

----------------------------------------------------------------------
 portal/js/push/push-config.html                 | 89 ++++++++++----------
 .../services/notifications/gcm/GCMAdapter.java  | 10 ++-
 2 files changed, 54 insertions(+), 45 deletions(-)
----------------------------------------------------------------------