From 31a298fec792ec1d1efb5f47763e4b0a16f24e6d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Fri, 18 Feb 2022 05:49:53 -0700
Subject: [PATCH] Advertise Matrix 1.1 in `/_matrix/client/versions` (#12020)

---
 changelog.d/12020.feature       | 1 +
 synapse/rest/client/versions.py | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/12020.feature

diff --git a/changelog.d/12020.feature b/changelog.d/12020.feature
new file mode 100644
index 000000000..1ac9d2060
--- /dev/null
+++ b/changelog.d/12020.feature
@@ -0,0 +1 @@
+Advertise Matrix 1.1 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 2290c57c1..35b88e9bb 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -73,6 +73,7 @@ class VersionsRestServlet(RestServlet):
                     "r0.5.0",
                     "r0.6.0",
                     "r0.6.1",
+                    "v1.1",
                 ],
                 # as per MSC1497:
                 "unstable_features": {