diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-08 15:55:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 15:55:47 +0000 |
| commit | d2f3ef98ac21929805f63a8a4964c3b97a22d1e1 (patch) | |
| tree | 7eac0a444d3b04cb11d49a28b0d61a7c4f795d2d /synapse/config/server.py | |
| parent | Ability to disable client/server Synapse via conf toggle (diff) | |
| parent | Merge pull request #3662 from matrix-org/neilj/reserved_users (diff) | |
| download | synapse-d2f3ef98ac21929805f63a8a4964c3b97a22d1e1.tar.xz | |
Merge branch 'develop' into neilj/disable_hs
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 2e1e2f5961..3b078d72ca 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -74,6 +74,9 @@ class ServerConfig(Config): self.max_mau_value = config.get( "max_mau_value", 0, ) + self.mau_limits_reserved_threepids = config.get( + "mau_limit_reserved_threepids", [] + ) # Options to disable HS self.hs_disabled = config.get("hs_disabled", False) |