Merge branch 'develop' into neilj/disable_hs

This commit is contained in:
Neil Johnson 2018-08-08 15:55:47 +00:00 committed by GitHub
commit d2f3ef98ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 115 additions and 7 deletions

View file

@ -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)