diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-19 18:13:31 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-19 18:13:31 +0100 |
| commit | b65327ff661b87991566314cf07088a7e789b69b (patch) | |
| tree | 75da1c79db8165ee6b3676b784a0d567551cb82d /synapse/server_notices | |
| parent | better logging (diff) | |
| parent | fix sample config (diff) | |
| download | synapse-b65327ff661b87991566314cf07088a7e789b69b.tar.xz | |
Merge branch 'develop' into rav/saml_mapping_work
Diffstat (limited to 'synapse/server_notices')
| -rw-r--r-- | synapse/server_notices/resource_limits_server_notices.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/server_notices/resource_limits_server_notices.py b/synapse/server_notices/resource_limits_server_notices.py index 729c097e6d..81c4aff496 100644 --- a/synapse/server_notices/resource_limits_server_notices.py +++ b/synapse/server_notices/resource_limits_server_notices.py @@ -193,4 +193,4 @@ class ResourceLimitsServerNotices(object): if event_id in referenced_events: referenced_events.remove(event.event_id) - return (currently_blocked, referenced_events) + return currently_blocked, referenced_events |