From f0239f023ae94ddc90213ec0098ba664c86cb36a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Thu, 17 Feb 2022 15:06:25 -0700
Subject: [PATCH] Advertise Matrix 1.2 in `/_matrix/client/versions`

---
 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 000000000000..188fb125705a
--- /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 2290c57c126e..7ad8cea6c4d2 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -73,6 +73,7 @@ def on_GET(self, request: Request) -> Tuple[int, JsonDict]:
                     "r0.5.0",
                     "r0.6.0",
                     "r0.6.1",
+                    "v1.2",
                 ],
                 # as per MSC1497:
                 "unstable_features": {