summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-09-18 22:30:07 +0100
committerGitHub <noreply@github.com>2019-09-18 22:30:07 +0100
commit83af73a08a301e88fbf096096132cecfbfabad7a (patch)
tree9783261c48e3db14b841728b1fd3d08efde18bcf
parentnewsfile (diff)
downloadsynapse-joriks/3pid_comment_discrepancy.tar.xz
-rw-r--r--changelog.d/6028.feature1
-rw-r--r--changelog.d/6028.misc1
2 files changed, 1 insertions, 1 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`.
diff --git a/changelog.d/6028.misc b/changelog.d/6028.misc
deleted file mode 100644
index 85e81003ac..0000000000
--- a/changelog.d/6028.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix typo in account_treepid_delegates config.