diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-06-05 17:42:49 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-06-05 17:42:49 +0100 |
commit | 522bd3c8a373e28f6906a2099945038e42f8e2ba (patch) | |
tree | fc17bd3ac1fe07c68842c97cca05d32681b53d50 /synapse | |
parent | Port to sortedcontainers (with tests!) (#3332) (diff) | |
parent | Merge pull request #3290 from rubo77/patch-7 (diff) | |
download | synapse-522bd3c8a373e28f6906a2099945038e42f8e2ba.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/config/consent_config.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/config/consent_config.py b/synapse/config/consent_config.py index 8f6ed73328..e22c731aad 100644 --- a/synapse/config/consent_config.py +++ b/synapse/config/consent_config.py @@ -18,6 +18,9 @@ from ._base import Config DEFAULT_CONFIG = """\ # User Consent configuration # +# for detailed instructions, see +# https://github.com/matrix-org/synapse/blob/master/docs/consent_tracking.md +# # Parts of this section are required if enabling the 'consent' resource under # 'listeners', in particular 'template_dir' and 'version'. # |