summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-05-24 10:33:12 +0100
committerRichard van der Hoff <richard@matrix.org>2018-05-24 10:33:12 +0100
commit8c98281b8da9c4a8dd3d298c24fb35158682f4c1 (patch)
treedc14eca4295bac6480da9d30cb95b40917bb6674 /synapse/server.py
parentMerge pull request #3268 from matrix-org/rav/privacy_policy_docs (diff)
parentMerge pull request #3273 from matrix-org/rav/server_notices_avatar_url (diff)
downloadsynapse-8c98281b8da9c4a8dd3d298c24fb35158682f4c1.tar.xz
Merge branch 'release-v0.30.0' into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions