summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-11-15 11:35:34 +0000
committerErik Johnston <erik@matrix.org>2017-11-15 11:35:34 +0000
commitaa812feb418182aa5ebca76e428ce0bb5ecd9841 (patch)
treea92abd0c867b6d5ff5f16ebcc67a01d93a685553
parentMerge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs (diff)
parentMerge branch 'release-v0.25.0' of github.com:matrix-org/synapse (diff)
downloadsynapse-aa812feb418182aa5ebca76e428ce0bb5ecd9841.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
-rw-r--r--CHANGES.rst8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 8e84323079..a8b821a2d2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+Changes in synapse v0.25.0 (2017-11-15)
+=======================================
+
+Bug fixes:
+
+* Fix port script (PR #2673)
+
+
 Changes in synapse v0.25.0-rc1 (2017-11-14)
 ===========================================