summary refs log tree commit diff
path: root/changelog.d/6028.feature
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-09-24 12:57:32 +0100
committerRichard van der Hoff <richard@matrix.org>2019-09-24 12:57:32 +0100
commited8b92f0d22b9de96c5ac04ef8ef45531fe45a2c (patch)
treec6c35d841e75d73ed2a045d30d8abc87487a57ab /changelog.d/6028.feature
parentMerge commit '33757bad1' into rav/saml_mapping_work (diff)
parentAdd submit_url response parameter to msisdn /requestToken (#6079) (diff)
downloadsynapse-ed8b92f0d22b9de96c5ac04ef8ef45531fe45a2c.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work
Diffstat (limited to 'changelog.d/6028.feature')
-rw-r--r--changelog.d/6028.feature1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/6028.feature b/changelog.d/6028.feature
new file mode 100644
index 0000000000..cf603fa0c6
--- /dev/null
+++ b/changelog.d/6028.feature
@@ -0,0 +1 @@
+Replace `trust_identity_server_for_password_resets` config option with `account_threepid_delegates`.