summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-06-16 15:35:00 +0100
committerRichard van der Hoff <richard@matrix.org>2021-06-16 15:35:00 +0100
commit89013b99bd6bf54c079db27059a57d48dc9bac0f (patch)
tree2cb94604893136c35e16e053139617b30f65c20b /CHANGES.md
parentMerge branch 'release-v1.36' into matrix-org-hotfixes (diff)
parentA guide to the request log lines format. (#8436) (diff)
downloadsynapse-89013b99bd6bf54c079db27059a57d48dc9bac0f.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index aeec4fa5fa..0f9798a4d3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+Synapse 1.36.0 (2021-06-15)
+===========================
+
+No significant changes.
+
+
 Synapse 1.36.0rc2 (2021-06-11)
 ==============================