diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2021-03-23 10:24:03 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-03-23 10:24:03 +0000 |
commit | 6557eba7dc63e50e81c07805770a09ac856233b0 (patch) | |
tree | cae8a041d4847d5044bbea883ab8b075c403b1e5 | |
parent | Merge branch 'develop' into matrix-org-hotfixes (diff) | |
download | synapse-6557eba7dc63e50e81c07805770a09ac856233b0.tar.xz |
Revert "Patch to temporarily drop cross-user m.key_share_requests (#8675)"
This reverts commit d60af9305a07fadcf0270d1887c5b7d063834967.
-rw-r--r-- | changelog.d/8675.misc | 1 | ||||
-rw-r--r-- | synapse/federation/federation_server.py | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/changelog.d/8675.misc b/changelog.d/8675.misc deleted file mode 100644 |