summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2020-01-16 09:46:14 +0000
committerGitHub <noreply@github.com>2020-01-16 09:46:14 +0000
commit38e0e59f42de03b25ce84a95a578a8cdbe75ceb4 (patch)
treeffa335e48b18062826961cf27f1665070ad8c10c
parentPort synapse.replication.tcp to async/await (#6666) (diff)
downloadsynapse-38e0e59f42de03b25ce84a95a578a8cdbe75ceb4.tar.xz
Add org.matrix.e2e_cross_signing to unstable_features in /versions as per MSC1756 (#6712)
-rw-r--r--changelog.d/6712.feature1
-rw-r--r--synapse/rest/client/versions.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/6712.feature b/changelog.d/6712.feature
new file mode 100644
index 0000000000..2cce0ecf88
--- /dev/null
+++ b/changelog.d/6712.feature
@@ -0,0 +1 @@
+Add org.matrix.e2e_cross_signing to unstable_features in /versions as per [MSC1756](https://github.com/matrix-org/matrix-doc/pull/1756).
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index 2a477ad22e..3d0fefb4df 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -71,6 +71,8 @@ class VersionsRestServlet(RestServlet):
                     # Implements support for label-based filtering as described in
                     # MSC2326.
                     "org.matrix.label_based_filtering": True,
+                    # Implements support for cross signing as described in MSC1756
+                    "org.matrix.e2e_cross_signing": True,
                 },
             },
         )