summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-11-30 11:48:06 +0000
committerBrendan Abolivier <babolivier@matrix.org>2021-11-30 11:48:06 +0000
commite713855dca17a7605bae99ea8d71bc7f8657e4b8 (patch)
tree723f79596374042e349d55a6195cbe2b5eea29eb /CHANGES.md
parentMove notices up (diff)
downloadsynapse-e713855dca17a7605bae99ea8d71bc7f8657e4b8.tar.xz
Merge trust_identity_server_for_password_resets PRs v1.48.0
Diffstat (limited to '')
-rw-r--r--CHANGES.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 5dd2003905..c283e33876 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -53,7 +53,7 @@ Improved Documentation
 Deprecations and Removals
 -------------------------
 
-- Remove deprecated `trust_identity_server_for_password_resets` configuration flag. ([\#11395](https://github.com/matrix-org/synapse/issues/11395))
+- Remove deprecated `trust_identity_server_for_password_resets` configuration flag. ([\#11333](https://github.com/matrix-org/synapse/issues/11333), [\#11395](https://github.com/matrix-org/synapse/issues/11395))
 
 
 Internal Changes
@@ -73,7 +73,6 @@ Internal Changes
 - Add type hints to `synapse.util`. ([\#11321](https://github.com/matrix-org/synapse/issues/11321), [\#11328](https://github.com/matrix-org/synapse/issues/11328))
 - Improve type annotations in Synapse's test suite. ([\#11323](https://github.com/matrix-org/synapse/issues/11323), [\#11330](https://github.com/matrix-org/synapse/issues/11330))
 - Test that room alias deletion works as intended. ([\#11327](https://github.com/matrix-org/synapse/issues/11327))
-- Remove deprecated `trust_identity_server_for_password_resets` configuration flag. ([\#11333](https://github.com/matrix-org/synapse/issues/11333))
 - Add type annotations for some methods and properties in the module API. ([\#11341](https://github.com/matrix-org/synapse/issues/11341))
 - Fix running `scripts-dev/complement.sh`, which was broken in v1.47.0rc1. ([\#11368](https://github.com/matrix-org/synapse/issues/11368))
 - Rename internal functions for token generation to better reflect what they do. ([\#11369](https://github.com/matrix-org/synapse/issues/11369), [\#11370](https://github.com/matrix-org/synapse/issues/11370))