diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-05-24 10:33:12 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-05-24 10:33:12 +0100 |
commit | 8c98281b8da9c4a8dd3d298c24fb35158682f4c1 (patch) | |
tree | dc14eca4295bac6480da9d30cb95b40917bb6674 /synapse/config/consent_config.py | |
parent | Merge pull request #3268 from matrix-org/rav/privacy_policy_docs (diff) | |
parent | Merge pull request #3273 from matrix-org/rav/server_notices_avatar_url (diff) | |
download | synapse-8c98281b8da9c4a8dd3d298c24fb35158682f4c1.tar.xz |
Merge branch 'release-v0.30.0' into develop
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 +# """ |