diff options
author | David Baker <dave@matrix.org> | 2018-05-24 16:20:53 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2018-05-24 16:20:53 +0100 |
commit | 77a23e2e058bbc02a675bd6e14bff2c9906c68b2 (patch) | |
tree | 5b65ad8562dc2d584b35b47999b5e004ad21b387 /synapse/config/consent_config.py | |
parent | pep8 (diff) | |
parent | Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dir (diff) | |
download | synapse-77a23e2e058bbc02a675bd6e14bff2c9906c68b2.tar.xz |
Merge remote-tracking branch 'origin/develop' into dbkr/unbind
Diffstat (limited to 'synapse/config/consent_config.py')
-rw-r--r-- | synapse/config/consent_config.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/synapse/config/consent_config.py b/synapse/config/consent_config.py index 44c4711e6c..ddcd305f4c 100644 --- a/synapse/config/consent_config.py +++ b/synapse/config/consent_config.py @@ -43,10 +43,13 @@ DEFAULT_CONFIG = """\ # version: 1.0 # server_notice_content: # msgtype: m.text -# body: | -# Pls do consent kthx -# block_events_error: | -# You can't send any messages until you consent to the privacy policy. +# body: >- +# To continue using this homeserver you must review and agree to the +# terms and conditions at %(consent_uri)s +# block_events_error: >- +# To continue using this homeserver you must review and agree to the +# terms and conditions at %(consent_uri)s +# """ |