summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-01-13 10:31:23 +0000
committerErik Johnston <erik@matrix.org>2021-01-13 10:31:27 +0000
commitebd534b58d9d53dc5086a9dd9cb176868c7b93ef (patch)
treecaca2f4e58b83affd235455f61b1bc84bc202816
parentLink to GH profile and fix tense (diff)
downloadsynapse-ebd534b58d9d53dc5086a9dd9cb176868c7b93ef.tar.xz
Move removal warning up changelog v1.25.0 github/release-v1.25.0 release-v1.25.0
Diffstat (limited to '')
-rw-r--r--CHANGES.md18
1 files changed, 9 insertions, 9 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 653e1a6ed8..db11de0e85 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -26,15 +26,6 @@ We will make a good faith attempt to avoid breaking compatibility in all release
 
 We intend to continue producing .deb packages for Debian 9 (Stretch) and Ubuntu 16.04 (Xenial) through the transition period.
 
-Bugfixes
---------
-
-- Fix HTTP proxy support when using a proxy that is on a blacklisted IP. Introduced in v1.25.0rc1. Contributed by @Bubu. ([\#9084](https://github.com/matrix-org/synapse/issues/9084))
-
-
-Synapse 1.25.0rc1 (2021-01-06)
-==============================
-
 Removal warning
 ---------------
 
@@ -46,6 +37,15 @@ are deprecated and will be removed in a future release. They will be replaced by
 `POST /_synapse/admin/v1/rooms/<room_id>/delete` replaces `POST /_synapse/admin/v1/purge_room` and
 `POST /_synapse/admin/v1/shutdown_room/<room_id>`.
 
+Bugfixes
+--------
+
+- Fix HTTP proxy support when using a proxy that is on a blacklisted IP. Introduced in v1.25.0rc1. Contributed by @Bubu. ([\#9084](https://github.com/matrix-org/synapse/issues/9084))
+
+
+Synapse 1.25.0rc1 (2021-01-06)
+==============================
+
 Features
 --------