Merge remote-tracking branch 'origin/master' into nomenclature

This commit is contained in:
Jake Moshenko 2014-11-19 10:40:52 -05:00
commit b3886570eb
2 changed files with 1 additions and 0 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

View file

@ -2946,6 +2946,7 @@ function ConfirmInviteCtrl($scope, $location, UserService, ApiService, Notificat
ApiService.acceptOrganizationTeamInvite(null, params).then(function(resp) {
NotificationService.update();
UserService.load();
$location.path('/organization/' + resp.org + '/teams/' + resp.team);
}, function(resp) {
$scope.loading = false;