Merge remote-tracking branch 'origin/develop' into shhs

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/api/auth.py b/synapse/api/auth.py

index 960e66dbdc..0c6c93a87b 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -556,7 +556,7 @@ class Auth(object):
         """ Check if the given user is a local server admin.
 
         Args:
-            user (str): mxid of user to check
+            user (UserID): user to check
 
         Returns:
             bool: True if the user is an admin