summary refs log tree commit diff
path: root/changelog.d/5876.feature
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-09-19 15:05:31 +0100
committerRichard van der Hoff <richard@matrix.org>2019-09-19 15:05:31 +0100
commitb789c7eb03aaadee8d5e2f289a4c100fc01f71b8 (patch)
treeda9216150b667cd83fbc416b2431671fb5215d86 /changelog.d/5876.feature
parentAdd changelog (diff)
parentfix sample config (diff)
downloadsynapse-b789c7eb03aaadee8d5e2f289a4c100fc01f71b8.tar.xz
Merge branch 'develop' into rav/saml_config_cleanup
Diffstat (limited to 'changelog.d/5876.feature')
-rw-r--r--changelog.d/5876.feature1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/5876.feature b/changelog.d/5876.feature
new file mode 100644
index 0000000000..df88193fbd
--- /dev/null
+++ b/changelog.d/5876.feature
@@ -0,0 +1 @@
+Replace `trust_identity_server_for_password_resets` config option with `account_threepid_delegates`.
\ No newline at end of file