Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus

1 files changed, 2 insertions, 1 deletions

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

index a9cc322d7e..108ea0ea09 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -780,7 +780,8 @@ class Auth(object):
         such as monthly active user limiting or global disable flag
 
         Args:
-            user_id(str): If present, checks for presence against existing MAU cohort
+            user_id(str|None): If present, checks for presence against existing
+            MAU cohort
         """
         if self.hs.config.hs_disabled:
             raise AuthError(