summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2020-04-23 12:04:50 -0400
committerPatrick Cloke <patrickc@matrix.org>2020-04-23 12:04:50 -0400
commit68384d96fd22a874b62caa21d51418d447259b0d (patch)
tree0aa751070f6d62b92fd607f67c59b13c61d0039a /CHANGES.md
parentRevert "Revert "Merge pull request #7315 from matrix-org/babolivier/request_t... (diff)
parentMerge tag 'v1.12.4' (diff)
downloadsynapse-68384d96fd22a874b62caa21d51418d447259b0d.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 32c19e8bfa..adb2b3e163 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,13 @@ Next version
   should update to using the async/await version `complete_sso_login_async` which
   includes additional checks. The non-async version is considered deprecated.
 
+
+Synapse 1.12.4 (2020-04-23)
+===========================
+
+No significant changes.
+
+
 Synapse 1.12.4rc1 (2020-04-22)
 ==============================