summary refs log tree commit diff
path: root/synapse/config/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-05-23 16:29:44 +0100
committerGitHub <noreply@github.com>2018-05-23 16:29:44 +0100
commit23aa70cea800b28d7bee8cfd77cbbd4e10eeb10f (patch)
tree205889d0493c12844200a549949bf9e2113db7b7 /synapse/config/__init__.py
parentMerge docs on consent bits from PR #3268 into release branch (diff)
parentMerge branch 'release-v0.30.0' into rav/localpart_in_consent_uri (diff)
downloadsynapse-23aa70cea800b28d7bee8cfd77cbbd4e10eeb10f.tar.xz
Merge pull request #3272 from matrix-org/rav/localpart_in_consent_uri
Use the localpart in the consent uri
Diffstat (limited to 'synapse/config/__init__.py')
0 files changed, 0 insertions, 0 deletions