diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-14 10:26:56 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-11-14 10:26:56 +0000 |
commit | a65a5ea1250ade55eed97ded803e864b45c42a6d (patch) | |
tree | 9a195e73bdf184d39e42cc44a8b03c1cd29d9a25 /synapse | |
parent | lint (diff) | |
parent | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 (diff) | |
download | synapse-a65a5ea1250ade55eed97ded803e864b45c42a6d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/fix_account_data_sync
* 'develop' of github.com:matrix-org/synapse: Blacklist PurgeRoomTestCase (#6361) Set room version default to 5
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/config/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index d556df308d..9015ca5f87 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -41,7 +41,7 @@ logger = logging.Logger(__name__) # in the list. DEFAULT_BIND_ADDRESSES = ["::", "0.0.0.0"] -DEFAULT_ROOM_VERSION = "4" +DEFAULT_ROOM_VERSION = "5" ROOM_COMPLEXITY_TOO_GREAT = ( "Your homeserver is unable to join rooms this large or complex. " |