diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-15 16:28:30 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-15 16:28:30 +0100 |
commit | 4d1a8718b57390a8b6c2db8d2c8d836de1651b0b (patch) | |
tree | d1695c9c36bb475f3d63fea968e8b435890f803e /synapse/config/server.py | |
parent | fix typo (diff) | |
parent | Merge pull request #3653 from matrix-org/erikj/split_federation (diff) | |
download | synapse-4d1a8718b57390a8b6c2db8d2c8d836de1651b0b.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/update_limits_error_codes github/neilj/update_limits_error_codes neilj/update_limits_error_codes
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r-- | synapse/config/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 442ee4fde4..2190f3210a 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -82,7 +82,7 @@ class ServerConfig(Config): self.hs_disabled = config.get("hs_disabled", False) self.hs_disabled_message = config.get("hs_disabled_message", "") - # Admin email to direct users at should their instance become blocked + # Admin uri to direct users at should their instance become blocked # due to resource constraints self.admin_uri = config.get("admin_uri", None) |