summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-06-01 13:40:46 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-06-01 13:40:46 +0100
commit3fdaf4df55f52ccf283cf6b0ca73a3f98cd5e8f0 (patch)
tree06822a4cb22242b32d4eef36c25c0bae7b55a1f9
parentIndicate that there were no functional changes since v1.35.0rc3 (diff)
downloadsynapse-3fdaf4df55f52ccf283cf6b0ca73a3f98cd5e8f0.tar.xz
Merge v1.35.0rc3 into v1.35.0 due to incorrect tagging v1.35.0
-rw-r--r--CHANGES.md6
1 files changed, 1 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md
index c969fe1ebd..f03a53affc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,17 +1,13 @@
 Synapse 1.35.0 (2021-06-01)
 ===========================
 
-No changes since v1.35.0rc3.
+Note that [the tag](https://github.com/matrix-org/synapse/releases/tag/v1.35.0rc3) and [docker images](https://hub.docker.com/layers/matrixdotorg/synapse/v1.35.0rc3/images/sha256-34ccc87bd99a17e2cbc0902e678b5937d16bdc1991ead097eee6096481ecf2c4?context=explore) for `v1.35.0rc3` were incorrectly built. If you are experiencing issues with either, it is recommended to upgrade to the equivalent tag or docker image for the `v1.35.0` release.
 
 Deprecations and Removals
 -------------------------
 
 - The core Synapse development team plan to drop support for the [unstable API of MSC2858](https://github.com/matrix-org/matrix-doc/blob/master/proposals/2858-Multiple-SSO-Identity-Providers.md#unstable-prefix), including the undocumented `experimental.msc2858_enabled` config option, in August 2021. Client authors should ensure that their clients are updated to use the stable API (which has been supported since Synapse 1.30) well before that time, to give their users time to upgrade. ([\#10101](https://github.com/matrix-org/synapse/issues/10101))
 
-
-Synapse 1.35.0rc3 (2021-05-28)
-==============================
-
 Bugfixes
 --------