summary refs log tree commit diff
path: root/synapse/rest/key/v2/remote_key_resource.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-08-17 09:22:30 +0100
committerRichard van der Hoff <richard@matrix.org>2019-08-17 09:22:30 +0100
commit80898481abc9ec741094a27c6412256a38ea11dd (patch)
treeb90e3c0486744513f05b9cac4a176dac5d185739 /synapse/rest/key/v2/remote_key_resource.py
parentMerge branch 'release-v1.3.0' of github.com:matrix-org/synapse into matrix-or... (diff)
parent1.3.1 (diff)
downloadsynapse-80898481abc9ec741094a27c6412256a38ea11dd.tar.xz
Merge branch 'release-v1.3.1' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/key/v2/remote_key_resource.py')
0 files changed, 0 insertions, 0 deletions