diff options
| author | Erik Johnston <erik@matrix.org> | 2021-08-24 17:13:29 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-08-24 17:13:29 +0100 |
| commit | cd22fb568a190a1b2083b651a48495439d6ced99 (patch) | |
| tree | b426843cbe20da156319a6fba7a14ed494edcf97 /synapse | |
| parent | Persist room hierarchy pagination sessions to the database. (#10613) (diff) | |
| parent | Update changelog (diff) | |
| download | synapse-cd22fb568a190a1b2083b651a48495439d6ced99.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/api/room_versions.py | 2 | ||||
| -rw-r--r-- | synapse/config/experimental.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 6ada20a77f..ef3770262e 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.41.0rc1" +__version__ = "1.41.0" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when diff --git a/synapse/api/room_versions.py b/synapse/api/room_versions.py index 11280c4462..8abcdfd4fd 100644 --- a/synapse/api/room_versions.py +++ b/synapse/api/room_versions.py @@ -293,7 +293,7 @@ MSC3244_CAPABILITIES = { ), RoomVersionCapability( "restricted", - None, + RoomVersions.V8, lambda room_version: room_version.msc3083_join_rules, ), ) diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py index a85d8a5dc6..95deda11a5 100644 --- a/synapse/config/experimental.py +++ b/synapse/config/experimental.py @@ -37,7 +37,7 @@ class ExperimentalConfig(Config): self.msc2285_enabled: bool = experimental.get("msc2285_enabled", False) # MSC3244 (room version capabilities) - self.msc3244_enabled: bool = experimental.get("msc3244_enabled", False) + self.msc3244_enabled: bool = experimental.get("msc3244_enabled", True) # MSC3283 (set displayname, avatar_url and change 3pid capabilities) self.msc3283_enabled: bool = experimental.get("msc3283_enabled", False) |