Merge branch 'develop' into anoa/remove_return_parans github/anoa/remove_return_parans anoa/remove_return_parans

1 files changed, 6 insertions, 1 deletions

diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py

index 0e09191632..c51c9e617d 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -44,7 +44,12 @@ class VersionsRestServlet(RestServlet):
                     "r0.5.0",
                 ],
                 # as per MSC1497:
-                "unstable_features": {"m.lazy_load_members": True},
+                "unstable_features": {
+                    "m.lazy_load_members": True,
+                    # as per https://github.com/matrix-org/synapse/issues/5927
+                    # to be removed in r0.6.0
+                    "m.id_access_token": True,
+                },
             },
         )