Skip to content

Commit 97ee5c7

Browse files
committed
Merge remote-tracking branch 'upstream/master' into synodim
2 parents 2ec8371 + a0c654a commit 97ee5c7

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Changes in [1.11.73](https://github.com/element-hq/element-web/releases/tag/v1.11.73) (2024-08-06)
2+
==================================================================================================
3+
Fixes for CVE-2024-42347 / GHSA-f83w-wqhc-cfp4
4+
5+
6+
17
Changes in [1.11.72](https://github.com/element-hq/element-web/releases/tag/v1.11.72) (2024-07-30)
28
==================================================================================================
39
## ✨ Features

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "element-web",
3-
"version": "1.11.72",
3+
"version": "1.11.73",
44
"description": "A feature-rich client for Matrix.org",
55
"author": "New Vector Ltd.",
66
"repository": {
@@ -77,7 +77,7 @@
7777
"katex": "^0.16.0",
7878
"lodash": "^4.17.21",
7979
"matrix-js-sdk": "34.2.0",
80-
"matrix-react-sdk": "3.104.0",
80+
"matrix-react-sdk": "3.105.1",
8181
"matrix-widget-api": "^1.3.1",
8282
"react": "17.0.2",
8383
"react-dom": "17.0.2",

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -7937,10 +7937,10 @@ matrix-mock-request@^2.5.0:
79377937
dependencies:
79387938
expect "^28.1.0"
79397939

7940-
matrix-react-sdk@3.104.0:
7941-
version "3.104.0"
7942-
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.104.0.tgz#148b9fd0c2afb7532c3bd2c7b1b5446c13c5097a"
7943-
integrity sha512-YQqYYKFaBTM8NORDMFV2gKS6qQpGw6Yj/r/MCcGc3GqUFDOHAwwd+gIR76nkJcoYHQ+JDBu7RQjsTgGqbeUSTg==
7940+
matrix-react-sdk@3.105.1:
7941+
version "3.105.1"
7942+
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.105.1.tgz#813ece3c0016f4824a3e398c8cf5ca73abacd601"
7943+
integrity sha512-IcsE+Dntq9oIpDG3wR3XR2qBmtAqdCU+vLjJuB5mJFwpuCHlBTU0BIJ0yKSEwlpV5no2Ajlfp9a+2nXhXd3CwA==
79447944
dependencies:
79457945
"@babel/runtime" "^7.12.5"
79467946
"@matrix-org/analytics-events" "^0.24.0"

0 commit comments

Comments
 (0)