diff options
| author | Erik Johnston <erik@matrix.org> | 2023-11-28 16:35:11 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2023-11-28 16:35:11 +0000 |
| commit | 825ac7e6a1a5a63cc1fd384e8cf4dd262d254965 (patch) | |
| tree | 1b7fb0abc7968a618cb7d96c2467acacdcc99e13 | |
| parent | Document which versions of Synapse have compatible schema versions. (#16661) (diff) | |
| parent | 1.97.0 (diff) | |
| download | synapse-825ac7e6a1a5a63cc1fd384e8cf4dd262d254965.tar.xz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGES.md | 8 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | pyproject.toml | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md index 40a2e086c5..bb34267af3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -# Synapse 1.97.0rc1 (2023-11-21) +# Synapse 1.97.0 (2023-11-28) Synapse will soon be forked by Element under an AGPLv3.0 licence (with CLA, for proprietary dual licensing). You can read more about this here: @@ -10,6 +10,12 @@ The Matrix.org Foundation copy of the project will be archived. Any changes need by server administrators will be communicated via our usual announcements channels, but we are striving to make this as seamless as possible. + +No significant changes since 1.97.0rc1. + + +# Synapse 1.97.0rc1 (2023-11-21) + ### Features - Add support for asynchronous uploads as defined by [MSC2246](https://github.com/matrix-org/matrix-spec-proposals/pull/2246). Contributed by @sumnerevans at @beeper. ([\#15503](https://github.com/matrix-org/synapse/issues/15503)) diff --git a/debian/changelog b/debian/changelog index 1a4be59be1..5ec8771604 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.97.0) stable; urgency=medium + + * New Synapse release 1.97.0. + + -- Synapse Packaging team <packages@matrix.org> Tue, 28 Nov 2023 14:08:58 +0000 + matrix-synapse-py3 (1.97.0~rc1) stable; urgency=medium * New Synapse release 1.97.0rc1. diff --git a/pyproject.toml b/pyproject.toml index df683a146f..b2a4fd7a2f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust" [tool.poetry] name = "matrix-synapse" -version = "1.97.0rc1" +version = "1.97.0" description = "Homeserver for the Matrix decentralised comms protocol" authors = ["Matrix.org Team and Contributors <packages@matrix.org>"] license = "Apache-2.0" |