summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-01-13 10:23:16 +0000
committerErik Johnston <erik@matrix.org>2021-01-13 10:23:16 +0000
commit429c339de8ba988088eacf9143f6e1c6de431efe (patch)
tree98bbb79bb7c42bce6c184db5b621a88a19ebfa9a /CHANGES.md
parent 1.25.0 (diff)
downloadsynapse-429c339de8ba988088eacf9143f6e1c6de431efe.tar.xz
Fixup changelog
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md15
1 files changed, 6 insertions, 9 deletions
diff --git a/CHANGES.md b/CHANGES.md
index aaded5bd24..583a391ba9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,15 +1,6 @@
 Synapse 1.25.0 (2021-01-13)
 ===========================
 
-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.0 (2021-01-13)
-==============================
-
 Ending Support for Python 3.5 and Postgres 9.5
 ----------------------------------------------
 
@@ -35,6 +26,12 @@ 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)
 ==============================