Merge branch 'master' of github.com:reality/depressionbot

This commit is contained in:
reality 2013-01-17 17:44:39 +00:00
commit d0a0579b57

View File

@ -29,9 +29,10 @@ var api = function(dbot) {
}, this);
if(!_.isUndefined(resolvedUser)) user = resolvedUser;
}
else{
user = resolvedUser;
}
}
return user;
},