aboutsummaryrefslogtreecommitdiff
path: root/discord/user.py
diff options
context:
space:
mode:
authorRapptz <[email protected]>2016-10-17 18:25:23 -0400
committerRapptz <[email protected]>2017-01-03 09:51:54 -0500
commitd1d54a468a88323a8ef7798ff084a1371d5893ec (patch)
tree21dd315df95acd2c8d6cf63cc51fa4cadc0c7155 /discord/user.py
parentStateful Message and remove Invite.xkcd since it is removed. (diff)
downloaddiscord.py-d1d54a468a88323a8ef7798ff084a1371d5893ec.tar.xz
discord.py-d1d54a468a88323a8ef7798ff084a1371d5893ec.zip
Rename Server to Guild everywhere.
Diffstat (limited to 'discord/user.py')
-rw-r--r--discord/user.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/discord/user.py b/discord/user.py
index c14a118e..a27a06c6 100644
--- a/discord/user.py
+++ b/discord/user.py
@@ -136,7 +136,7 @@ class User:
"""Returns the user's display name.
For regular users this is just their username, but
- if they have a server specific nickname then that
+ if they have a guild specific nickname then that
is returned instead.
"""
return getattr(self, 'nick', None) or self.name