Merge branch 'master' into develop

RiotRobot · RiotRobot · commit 23d2d03912a6 · 2024-11-12T09:30:35.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+Changes in [34.11.1](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v34.11.1) (2024-11-12)
+====================================================================================================
+# Security
+- Fixes for [CVE-2024-50336](https://nvd.nist.gov/vuln/detail/CVE-2024-50336) / [GHSA-xvg8-m4x3-w6xr](https://github.com/matrix-org/matrix-js-sdk/security/advisories/GHSA-xvg8-m4x3-w6xr).
+
 Changes in [34.11.0](https://github.com/matrix-org/matrix-js-sdk/releases/tag/v34.11.0) (2024-11-12)
 ====================================================================================================
 # Security
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "matrix-js-sdk",
-    "version": "34.10.0",
+    "version": "34.11.1",
     "description": "Matrix Client-Server SDK for Javascript",
     "engines": {
         "node": ">=20.0.0"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "matrix-js-sdk",`
`3`		`- "version": "34.10.0",`
	`3`	`+ "version": "34.11.1",`
`4`	`4`	`"description": "Matrix Client-Server SDK for Javascript",`
`5`	`5`	`"engines": {`
`6`	`6`	`"node": ">=20.0.0"`