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/08/20 18:01:32 UTC
[8/8] git commit: Merge branch 'pr/53'
Merge branch 'pr/53'
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5c8df359
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5c8df359
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5c8df359
Branch: refs/heads/master
Commit: 5c8df3598f5d810077ce574dc09200182003c07c
Parents: 717e4fe 0ffb1e9
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 20 12:00:59 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 20 12:00:59 2014 -0400
----------------------------------------------------------------------
NOTICE | 13 +-
portal/js/libs/angular-1.0.5/angular-cookies.js | 183 -
.../libs/angular-1.0.5/angular-cookies.min.js | 7 -
portal/js/libs/angular-1.0.5/angular-loader.js | 276 -
.../js/libs/angular-1.0.5/angular-loader.min.js | 7 -
portal/js/libs/angular-1.0.5/angular-mocks.js | 1886 --
.../js/libs/angular-1.0.5/angular-resource.js | 445 -
.../libs/angular-1.0.5/angular-resource.min.js | 10 -
.../js/libs/angular-1.0.5/angular-sanitize.js | 535 -
.../libs/angular-1.0.5/angular-sanitize.min.js | 13 -
portal/js/libs/angular-1.0.5/angular.js | 14733 --------------
portal/js/libs/angular-1.0.5/angular.min.js | 161 -
portal/js/libs/angular-1.0.5/version.txt | 1 -
portal/js/libs/angular-1.1.5/angular-1.1.5.js | 16876 -----------------
.../js/libs/angular-1.1.5/angular-merge.min.js | 8 -
.../angular-1.1.5/angular-resource-1.1.5.js | 537 -
portal/js/libs/angular-1.2.5/LICENSE.txt | 22 +
portal/js/libs/bootstrap/LICENSE.txt | 21 +
portal/js/libs/jquery/LICENSE.txt | 37 +
portal/js/libs/jqueryui/LICENSE.txt | 45 +
sdks/php/kessel/config.ini | 18 -
sdks/php/kessel/kessel.rb | 188 -
22 files changed, 135 insertions(+), 35887 deletions(-)
----------------------------------------------------------------------