diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-14 17:43:22 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-14 17:43:22 +0100 |
commit | b586b8b986fbeeb71eb864bd12b19c4b226535ab (patch) | |
tree | 269fe2cf7d8df454df32633ec025fbdb95a164d4 /synapse/api | |
parent | fix off by 1 errors (diff) | |
parent | Merge pull request #3692 from matrix-org/neil/fix_postgres_test_initialise_re... (diff) | |
download | synapse-b586b8b986fbeeb71eb864bd12b19c4b226535ab.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/fix_off_by_1+maus
Diffstat (limited to 'synapse/api')
-rw-r--r-- | synapse/api/auth.py | 3 |
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( |