summary refs log tree commit diff
diff options
context:
space:
mode:
authorTravis Ralston <travisr@matrix.org>2022-02-21 08:59:29 -0700
committerGitHub <noreply@github.com>2022-02-21 08:59:29 -0700
commit99f6d79fe17b2f96c6c3cf85c4f0fee255758300 (patch)
tree945927bd16f922690d5f869db9849aea0d157172
parentDocument why auth providers aren't validated in the admin API. (#12004) (diff)
downloadsynapse-99f6d79fe17b2f96c6c3cf85c4f0fee255758300.tar.xz
Advertise Matrix 1.2 in `/_matrix/client/versions` (#12022)
Co-authored-by: Patrick Cloke <patrickc@matrix.org>
Diffstat (limited to '')
-rw-r--r--changelog.d/12022.feature1
-rw-r--r--synapse/rest/client/versions.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/12022.feature b/changelog.d/12022.feature
new file mode 100644
index 0000000000..188fb12570
--- /dev/null
+++ b/changelog.d/12022.feature
@@ -0,0 +1 @@
+Advertise Matrix 1.2 support on `/_matrix/client/versions`.
\ No newline at end of file
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index 35b88e9bbf..00f29344a8 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -74,6 +74,7 @@ class VersionsRestServlet(RestServlet):
                     "r0.6.0",
                     "r0.6.1",
                     "v1.1",
+                    "v1.2",
                 ],
                 # as per MSC1497:
                 "unstable_features": {