diff options
author | Erik Johnston <erik@matrix.org> | 2023-06-20 18:56:18 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2023-06-20 18:56:18 +0100 |
commit | 1fcefd8f3ea6bbca769b1ca8937f8cf5e17239d5 (patch) | |
tree | b4dfb994f682502244149638f2662f42d163114b | |
parent | Fix Sytest environmental variable evaluation in CI (#15804) (diff) | |
parent | 1.86.0 (diff) | |
download | synapse-1fcefd8f3ea6bbca769b1ca8937f8cf5e17239d5.tar.xz |
Merge branch 'master' into develop
-rw-r--r-- | CHANGES.md | 6 | ||||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | pyproject.toml | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md index f2f39c3b6e..ff4126044b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +Synapse 1.86.0 (2023-06-20) +=========================== + +No significant changes since 1.86.0rc2. + + Synapse 1.86.0rc2 (2023-06-14) ============================== diff --git a/debian/changelog b/debian/changelog index 81b71ba342..9d057c65ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.86.0) stable; urgency=medium + + * New Synapse release 1.86.0. + + -- Synapse Packaging team <packages@matrix.org> Tue, 20 Jun 2023 17:22:46 +0200 + matrix-synapse-py3 (1.86.0~rc2) stable; urgency=medium * New Synapse release 1.86.0rc2. diff --git a/pyproject.toml b/pyproject.toml index 7f2f7927c9..90812de019 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml" [tool.poetry] name = "matrix-synapse" -version = "1.86.0rc2" +version = "1.86.0" description = "Homeserver for the Matrix decentralised comms protocol" authors = ["Matrix.org Team and Contributors <packages@matrix.org>"] license = "Apache-2.0" |