OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

pull/24975/head
RiotRobot 2023-03-28 14:45:38 +01:00
parent f033becebb 7a002341f4
commit b472f34d63
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
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) Changes in [1.11.25](https://github.com/vector-im/element-web/releases/tag/v1.11.25) (2023-03-15)
================================================================================================= =================================================================================================

2
package.json
View File

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

11
yarn.lock
View File

@ -8101,9 +8101,16 @@ matrix-mock-request@^2.5.0:
dependencies: dependencies:
expect "^28.1.0" expect "^28.1.0"
<<<<<<< HEAD
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": "matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.68.0" version "3.68.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f37ae1e230793232fcec65ae2b3ce1f15c2a630a" 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: dependencies:
"@babel/runtime" "^7.12.5" "@babel/runtime" "^7.12.5"
"@matrix-org/analytics-events" "^0.5.0" "@matrix-org/analytics-events" "^0.5.0"
@ -8142,7 +8149,11 @@ matrix-mock-request@^2.5.0:
maplibre-gl "^2.0.0" maplibre-gl "^2.0.0"
matrix-encrypt-attachment "^1.0.3" matrix-encrypt-attachment "^1.0.3"
matrix-events-sdk "0.0.1" matrix-events-sdk "0.0.1"
<<<<<<< HEAD
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
=======
matrix-js-sdk "24.0.0"
>>>>>>> master
matrix-widget-api "^1.1.1" matrix-widget-api "^1.1.1"
minimist "^1.2.5" minimist "^1.2.5"
opus-recorder "^8.0.3" opus-recorder "^8.0.3"