diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2021-03-19 16:12:40 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2021-03-19 16:12:40 +0100 |
| commit | 592d6305fda97ceda92a8ce6079a9fdbe9928567 (patch) | |
| tree | 7a0edf2be5f22754bf8da194a1412d740ef0a004 /synapse/config | |
| parent | Fix lint (diff) | |
| parent | fix mypy (diff) | |
| download | synapse-592d6305fda97ceda92a8ce6079a9fdbe9928567.tar.xz | |
Merge branch 'develop' into babolivier/msc3026
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/experimental.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py index 2f0cd0cfdf..86f4d9af9d 100644 --- a/synapse/config/experimental.py +++ b/synapse/config/experimental.py @@ -27,5 +27,7 @@ class ExperimentalConfig(Config): # MSC2858 (multiple SSO identity providers) self.msc2858_enabled = experimental.get("msc2858_enabled", False) # type: bool + # Spaces (MSC1772, MSC2946, etc) + self.spaces_enabled = experimental.get("spaces_enabled", False) # type: bool # MSC3026 (busy presence state) self.msc3026_enabled = experimental.get("msc3026_enabled", False) # type: bool |