mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2026-03-02 20:12:04 +01:00
Code Issues Projects Releases Wiki Activity

Other half of the merge

Browse Source
This commit is contained in:
David Baker 2026-02-17 14:34:48 +00:00
parent d606c4966a
commit b1254201db
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pnpm-lock.yaml generated
View File

@ -7726,14 +7726,9 @@ packages:
matrix-events-sdk@0.0.1:
resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==}
<<<<<<< HEAD
matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e74eb4928e748194165b7200afe48e582bdc1fd7:
resolution: {tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e74eb4928e748194165b7200afe48e582bdc1fd7}
version: 40.2.0
=======
matrix-js-sdk@40.3.0-rc.0:
resolution: {integrity: sha512-MxFPnlzca/g5Fq/MMN5jkzwExUv725/weW+Ids7Dwmcy34WC8NROBOhfqGJkwbAWLkJDEUKRe3+//2tHXmnnHQ==}
>>>>>>> staging
engines: {node: '>=22.0.0'}
matrix-web-i18n@3.6.0:
@ -18539,11 +18534,7 @@ snapshots:
matrix-events-sdk@0.0.1: {}
<<<<<<< HEAD
matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e74eb4928e748194165b7200afe48e582bdc1fd7:
=======
matrix-js-sdk@40.3.0-rc.0:
>>>>>>> staging
dependencies:
'@babel/runtime': 7.28.6
'@matrix-org/matrix-sdk-crypto-wasm': 17.1.0