summary refs log tree commit diff
path: root/CHANGES.md
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2023-11-17 08:43:47 -0500
committerPatrick Cloke <patrickc@matrix.org>2023-11-17 08:43:47 -0500
commitbdb0cbc5cafb40f6d4920caac763feeeff0f60cf (patch)
treefcb582ba48812bbb63cf48cbaf82afead39a0cf5 /CHANGES.md
parentUpdate admin user API return types in docs. (#16654) (diff)
parentTweaks from review. (diff)
downloadsynapse-bdb0cbc5cafb40f6d4920caac763feeeff0f60cf.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'CHANGES.md')
-rw-r--r--CHANGES.md25
1 files changed, 25 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 2e7f199299..9358a22525 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,28 @@
+# Synapse 1.96.1 (2023-11-17)
+
+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:
+
+* https://matrix.org/blog/2023/11/06/future-of-synapse-dendrite/
+* https://element.io/blog/element-to-adopt-agplv3/
+
+The Matrix.org Foundation copy of the project will be archived. Any changes needed
+by server administrators will be communicated via our usual
+[announcements channels](https://matrix.to/#/#homeowners:matrix.org), but we are
+striving to make this as seamless as possible.
+
+This minor release was needed only because of CI-related trouble on [v1.96.0](https://github.com/matrix-org/synapse/releases/tag/v1.96.0), which was never released.
+
+### Internal Changes
+
+- Fix building of wheels in CI. ([\#16653](https://github.com/matrix-org/synapse/issues/16653))
+
+# Synapse 1.96.0 (2023-11-16)
+
+### Bugfixes
+
+- Fix "'int' object is not iterable" error in `set_device_id_for_pushers` background update introduced in Synapse 1.95.0. ([\#16594](https://github.com/matrix-org/synapse/issues/16594))
+
 # Synapse 1.96.0rc1 (2023-10-31)
 
 ### Features