summary refs log tree commit diff
path: root/synapse/config/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-14 10:26:27 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-14 10:26:27 +0000
commit473acedcdde26372003359a97699fba833824692 (patch)
treedf6441348856b5a731b91ca09602a9e127bb8801 /synapse/config/server.py
parentsample config (diff)
parentMerge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 (diff)
downloadsynapse-473acedcdde26372003359a97699fba833824692.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_copy
* 'develop' of github.com:matrix-org/synapse:
  Blacklist PurgeRoomTestCase (#6361)
  Set room version default to 5
Diffstat (limited to 'synapse/config/server.py')
-rw-r--r--synapse/config/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index a1bd3c0ae7..00d01c43af 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. "