Merge branch 'develop' into babolivier/msc3026

This commit is contained in:
Brendan Abolivier 2021-03-19 16:12:40 +01:00
commit 592d6305fd
No known key found for this signature in database
GPG key ID: 1E015C145F1916CD
18 changed files with 574 additions and 165 deletions

View file

@ -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