diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-05-31 11:38:13 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-05-31 11:38:13 +0100 |
commit | c605da97bff8dc749ebea1fc016f231461b2c19f (patch) | |
tree | 8a1f131272010881b97c215e4a5518dd1ebc4735 /synapse/http/additional_resource.py | |
parent | Rewrite get_server_verify_keys, again. (diff) | |
parent | Merge pull request #5300 from matrix-org/rav/server_keys/06-fix-serverkeys-ha... (diff) | |
download | synapse-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