Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2023-03-28 14:45:38 +01:00
commit b472f34d63
3 changed files with 19 additions and 1 deletions

View file

@ -1,3 +1,10 @@
Changes in [1.11.26](https://github.com/vector-im/element-web/releases/tag/v1.11.26) (2023-03-28)
=================================================================================================
## 🐛 Bug Fixes
* Changes for matrix-js-sdk v24.0.0
* Changes for matrix-react-sdk v3.69.0
Changes in [1.11.25](https://github.com/vector-im/element-web/releases/tag/v1.11.25) (2023-03-15)
=================================================================================================

View file

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.11.25",
"version": "1.11.26",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {

View file

@ -8101,9 +8101,16 @@ matrix-mock-request@^2.5.0:
dependencies:
expect "^28.1.0"
<<<<<<< HEAD
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.68.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f37ae1e230793232fcec65ae2b3ce1f15c2a630a"
=======
matrix-react-sdk@3.69.0:
version "3.69.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.69.0.tgz#63bc203531b45c37f9aa928b389c89b205f940d1"
integrity sha512-QmMAk+k/W2eb+KMHcOWcDtQzg2OQ5KV38lUY6UGOnvlM2n823YzKaio2a0OhMPxhf6GQ0yIKPGiGBftV+SdDQw==
>>>>>>> master
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/analytics-events" "^0.5.0"
@ -8142,7 +8149,11 @@ matrix-mock-request@^2.5.0:
maplibre-gl "^2.0.0"
matrix-encrypt-attachment "^1.0.3"
matrix-events-sdk "0.0.1"
<<<<<<< HEAD
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
=======
matrix-js-sdk "24.0.0"
>>>>>>> master
matrix-widget-api "^1.1.1"
minimist "^1.2.5"
opus-recorder "^8.0.3"