diff options
author | Erik Johnston <erik@matrix.org> | 2021-06-15 15:52:24 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-06-15 15:52:24 +0100 |
commit | d09e24a52d2cdd062efd73bc28e4fe2cd9bbab5e (patch) | |
tree | 3f50913b8164d6b4f5d60d12d946c717c3421467 /CHANGES.md | |
parent | Remove support for unstable MSC1772 prefixes. (#10161) (diff) | |
parent | 1.36.0 (diff) | |
download | synapse-d09e24a52d2cdd062efd73bc28e4fe2cd9bbab5e.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'CHANGES.md')
-rw-r--r-- | CHANGES.md | 6 |
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) ============================== |