diff options
| author | Eric Eastwood <erice@element.io> | 2022-09-14 18:14:17 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-09-14 18:14:17 -0500 |
| commit | dab846568de09742c038a9a5a5ed00539ff5aa38 (patch) | |
| tree | ef4220faa96569d1d8d5f386c92bb4df2655eeed /synapse/config/sso.py | |
| parent | Add changelog (diff) | |
| parent | Keep track when we try and fail to process a pulled event (#13589) (diff) | |
| download | synapse-madlittlemods/event_id_always_failed_to_fetch.tar.xz | |
Merge branch 'develop' into madlittlemods/event_id_always_failed_to_fetch github/madlittlemods/event_id_always_failed_to_fetch madlittlemods/event_id_always_failed_to_fetch
Conflicts: synapse/handlers/federation_event.py
Diffstat (limited to 'synapse/config/sso.py')
| -rw-r--r-- | synapse/config/sso.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/sso.py b/synapse/config/sso.py index 2178cbf983..a452cc3a49 100644 --- a/synapse/config/sso.py +++ b/synapse/config/sso.py @@ -26,7 +26,7 @@ LEGACY_TEMPLATE_DIR_WARNING = """ This server's configuration file is using the deprecated 'template_dir' setting in the 'sso' section. Support for this setting has been deprecated and will be removed in a future version of Synapse. Server admins should instead use the new -'custom_templates_directory' setting documented here: +'custom_template_directory' setting documented here: https://matrix-org.github.io/synapse/latest/templates.html ---------------------------------------------------------------------------------------""" |