Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Richard van der Hoff 2018-06-05 17:42:49 +01:00
commit 522bd3c8a3

View File

@ -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'.
#