summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-03-19 18:19:50 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-03-19 18:19:50 +0100
commitb6ed4f55acf7af44af1d33097407d2dd7f08b5a5 (patch)
treee4877c8022cda6b7953edc8066a6af8dc329082a /synapse/rest
parentMerge branch 'develop' into babolivier/msc3026 (diff)
downloadsynapse-b6ed4f55acf7af44af1d33097407d2dd7f08b5a5.tar.xz
Incorporate review
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/versions.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index f387d29b57..3e3d8839f4 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -82,7 +82,7 @@ class VersionsRestServlet(RestServlet):
                     "io.element.e2ee_forced.private": self.e2ee_forced_private,
                     "io.element.e2ee_forced.trusted_private": self.e2ee_forced_trusted_private,
                     # Supports the busy presence state described in MSC3026.
-                    "org.matrix.msc3026.busy_presence": True,
+                    "org.matrix.msc3026.busy_presence": self.config.experimental.msc3026_enabled,
                 },
             },
         )