From 99f6d79fe17b2f96c6c3cf85c4f0fee255758300 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Mon, 21 Feb 2022 08:59:29 -0700
Subject: [PATCH] Advertise Matrix 1.2 in `/_matrix/client/versions` (#12022)

Co-authored-by: Patrick Cloke <patrickc@matrix.org>
---
 changelog.d/12022.feature       | 1 +
 synapse/rest/client/versions.py | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/12022.feature

diff --git a/changelog.d/12022.feature b/changelog.d/12022.feature
new file mode 100644
index 000000000..188fb1257
--- /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 35b88e9bb..00f29344a 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": {