diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-05-24 14:12:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-24 14:12:38 +0100 |
commit | dba9152d1593c9de176e969153b30b4ef19f29ae (patch) | |
tree | f6fd936f80321320677217d39f12ce4f3dd583c1 | |
parent | Merge pull request #5220 from matrix-org/erikj/dont_bundle_live_events (diff) | |
download | synapse-dba9152d1593c9de176e969153b30b4ef19f29ae.tar.xz |
Add missing blank line in config (#5249)
-rw-r--r-- | changelog.d/5249.feature | 1 | ||||
-rw-r--r-- | docs/sample_config.yaml | 1 | ||||
-rw-r--r-- | synapse/config/server.py | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/5249.feature b/changelog.d/5249.feature new file mode 100644 index 0000000000..cfdf1ad41b --- /dev/null +++ b/changelog.d/5249.feature @@ -0,0 +1 @@ +Ability to configure default room version. diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 2a5a514d61..421ae96f04 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -90,6 +90,7 @@ pid_file: DATADIR/homeserver.pid # # For example, for room version 1, default_room_version should be set # to "1". +# #default_room_version: "1" # The GC threshold parameters to pass to `gc.set_threshold`, if defined diff --git a/synapse/config/server.py b/synapse/config/server.py index e9120d4d75..e763e19e15 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -414,6 +414,7 @@ class ServerConfig(Config): # # For example, for room version 1, default_room_version should be set # to "1". + # #default_room_version: "%(default_room_version)s" # The GC threshold parameters to pass to `gc.set_threshold`, if defined |