Merge branch 'oauth3' of git.daplie.com:Daplie/walnut_launchpad into jon/rebuild-dropbox-features

This commit is contained in:
Jon Lambson 2017-10-31 12:53:12 -06:00
commit 9368a25fd2
1 changed files with 5 additions and 2 deletions

View File

@ -111,11 +111,14 @@ app.controller('websiteCtrl', [
el.session = session.token.sub + '@' + session.token.iss;
});
}, function(err) {
console.error("There was an error 1A", err);
return els;
});
});
})).then(function (results) {
return els;
});
}, function(err) {console.error("There was an error 1B", err)});
};
vm.getDomains = function () {