summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-05-23 16:06:03 +0100
committerGitHub <noreply@github.com>2018-05-23 16:06:03 +0100
commita0b3946fe2b45956336d3ddce97df6ad3e1bb2e0 (patch)
tree06f1d9238ec9ea4033fd8298be6232c33078127a /synapse/config/server.py
parentUse the localpart in the consent uri (diff)
parentMerge pull request #3271 from matrix-org/rav/consent_uri_in_messages (diff)
downloadsynapse-a0b3946fe2b45956336d3ddce97df6ad3e1bb2e0.tar.xz
Merge branch 'release-v0.30.0' into rav/localpart_in_consent_uri
Diffstat (limited to 'synapse/config/server.py')
0 files changed, 0 insertions, 0 deletions