Merge branch 'githublogin'

This commit is contained in:
Joseph Schorr 2014-04-16 22:48:03 -04:00
commit a3bd2a065a
3 changed files with 8 additions and 7 deletions

View file

@ -1622,7 +1622,7 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use
$scope.convertStep = 0;
$scope.org = {};
$scope.githubRedirectUri = KeyService.githubRedirectUri;
$scope.githubClientId = KeyService.githubClientId;
$scope.githubClientId = KeyService.githubLoginClientId;
$scope.authorizedApps = null;
$scope.logsShown = 0;