diff --git a/changelog.d/6585.feature b/changelog.d/6585.feature
new file mode 100644
index 0000000000..ab2a85374e
--- /dev/null
+++ b/changelog.d/6585.feature
@@ -0,0 +1 @@
+Advertise support for Client-Server API r0.6.0 and remove related unstable feature flags.
\ No newline at end of file
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index d90a6a890b..0d668df0b6 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -49,24 +49,10 @@ class VersionsRestServlet(RestServlet):
"r0.3.0",
"r0.4.0",
"r0.5.0",
+ "r0.6.0",
],
# as per MSC1497:
"unstable_features": {
- # as per MSC2190, as amended by MSC2264
- # to be removed in r0.6.0
- "m.id_access_token": True,
- # Advertise to clients that they need not include an `id_server`
- # parameter during registration or password reset, as Synapse now decides
- # itself which identity server to use (or none at all).
- #
- # This is also used by a client when they wish to bind a 3PID to their
- # account, but not bind it to an identity server, the endpoint for which
- # also requires `id_server`. If the homeserver is handling 3PID
- # verification itself, there is no need to ask the user for `id_server` to
- # be supplied.
- "m.require_identity_server": False,
- # as per MSC2290
- "m.separate_add_and_bind": True,
# Implements support for label-based filtering as described in
# MSC2326.
"org.matrix.label_based_filtering": True,
|
