mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-10-01 11:49:51 -04:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
522bd3c8a3
@ -18,6 +18,9 @@ from ._base import Config
|
|||||||
DEFAULT_CONFIG = """\
|
DEFAULT_CONFIG = """\
|
||||||
# User Consent configuration
|
# 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
|
# Parts of this section are required if enabling the 'consent' resource under
|
||||||
# 'listeners', in particular 'template_dir' and 'version'.
|
# 'listeners', in particular 'template_dir' and 'version'.
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user