From eeef9633af74d1282c1d1b80bfb117c34f43482b Mon Sep 17 00:00:00 2001
From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
Date: Wed, 29 Apr 2020 11:30:06 +0100
Subject: Fix fallback value for account_threepid_delegates.email (#7316)

---
 changelog.d/7316.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/7316.bugfix

(limited to 'changelog.d/7316.bugfix')

diff --git a/changelog.d/7316.bugfix b/changelog.d/7316.bugfix
new file mode 100644
index 0000000000..0692696c7b
--- /dev/null
+++ b/changelog.d/7316.bugfix
@@ -0,0 +1 @@
+Fixed backwards compatibility logic of the first value of `trusted_third_party_id_servers` being used for `account_threepid_delegates.email`, which occurs when the former, deprecated option is set and the latter is not.
\ No newline at end of file
-- 
cgit 1.4.1