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/03/29 00:21:20 UTC

[27/34] git commit: merge

merge


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

Branch: refs/pull/86/head
Commit: abe152f36c90bdaecbfa62d38211fa2b5453f287
Parents: 48fd11f d1ee5ec
Author: Shawn Feldman <sh...@gmail.com>
Authored: Fri Mar 28 17:17:36 2014 -0600
Committer: Shawn Feldman <sh...@gmail.com>
Committed: Fri Mar 28 17:17:36 2014 -0600

----------------------------------------------------------------------
 portal/css/dash.min.css                         |  2 +-
 portal/css/main.css                             | 56 +++++++++++---------
 portal/js/global/help-service.js                |  6 +--
 .../js/libs/bootstrap/custom/css/bootstrap.css  | 15 +++---
 .../libs/bootstrap/custom/css/bootstrap.min.css |  2 +-
 portal/js/libs/usergrid-libs.min.js             |  2 +-
 portal/js/usergrid-dev.min.js                   |  6 +--
 portal/js/usergrid.min.js                       |  2 +-
 8 files changed, 50 insertions(+), 41 deletions(-)
----------------------------------------------------------------------