Merge branch 'release-v1.37' of github.com:matrix-org/synapse into matrix-org-hotfixes

1 files changed, 3 insertions, 0 deletions

diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py

index 6ebce4b2f7..7fb1f7021f 100644
--- a/synapse/config/experimental.py
+++ b/synapse/config/experimental.py
@@ -29,3 +29,6 @@ class ExperimentalConfig(Config):
 
         # MSC3026 (busy presence state)
         self.msc3026_enabled = experimental.get("msc3026_enabled", False)  # type: bool
+
+        # MSC2716 (backfill existing history)
+        self.msc2716_enabled = experimental.get("msc2716_enabled", False)  # type: bool