summary refs log tree commit diff
path: root/synapse/http/additional_resource.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-31 11:38:13 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-31 11:38:13 +0100
commitc605da97bff8dc749ebea1fc016f231461b2c19f (patch)
tree8a1f131272010881b97c215e4a5518dd1ebc4735 /synapse/http/additional_resource.py
parentRewrite get_server_verify_keys, again. (diff)
parentMerge pull request #5300 from matrix-org/rav/server_keys/06-fix-serverkeys-ha... (diff)
downloadsynapse-c605da97bff8dc749ebea1fc016f231461b2c19f.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/server_keys/05-rewrite-gsvk-again
Diffstat (limited to 'synapse/http/additional_resource.py')
0 files changed, 0 insertions, 0 deletions