Merge branch 'oauth3' of git.daplie.com:Daplie/walnut_launchpad into jon/rebuild-dropbox-features
This commit is contained in:
		
						commit
						9368a25fd2
					
				@ -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 () {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user