summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-08-30 17:13:37 +0100
committerGitHub <noreply@github.com>2019-08-30 17:13:37 +0100
commit2a012e8a049858fe379599207fac34b6b2e11101 (patch)
tree3280c09e51036474d11bda77333a11bd5e3afb58 /synapse/rest
parent Remove unnecessary parentheses around return statements (#5931) (diff)
downloadsynapse-2a012e8a049858fe379599207fac34b6b2e11101.tar.xz
Revert "Add m.id_access_token flag (#5930)" (#5945)
This reverts commit 4765f0cfd95f6160f32c75481651d125f343cd58.
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/versions.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index c51c9e617d..0e09191632 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -44,12 +44,7 @@ class VersionsRestServlet(RestServlet):
                     "r0.5.0",
                 ],
                 # as per MSC1497:
-                "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,
-                },
+                "unstable_features": {"m.lazy_load_members": True},
             },
         )