Merge remote-tracking branch 'upstream/indev' into indev

This commit is contained in:
abalabahaha
2015-12-05 10:31:29 -08:00
2 changed files with 85 additions and 12 deletions

View File

@@ -71,7 +71,7 @@ export default class Server extends Equality {
}
}
details(user) {
detailsOf(user) {
user = this.client.internal.resolver.resolveUser(user);
if (user) {
return this.memberMap[user.id];
@@ -80,7 +80,7 @@ export default class Server extends Equality {
}
}
detailsOf(user) {
detailsOfUser(user) {
return this.details(user);
}