Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2024-02-13 15:03:27 +00:00
commit 6036dd01e1
3 changed files with 30 additions and 9 deletions

View file

@ -1841,7 +1841,7 @@
emojibase "^15.0.0"
emojibase-data "^15.0.0"
"@matrix-org/matrix-sdk-crypto-wasm@^4.1.0":
"@matrix-org/matrix-sdk-crypto-wasm@^4.3.0":
version "4.3.0"
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-4.3.0.tgz#ef08e7eafae6e9e85658c14a41f0d74a48c03f4a"
integrity sha512-05+NO78pXda/MTxi05NJwBbbAsOmU6WywBOcAk9GarPzgvrj4GvOuYTY6VR5PD7Gzb3AI+vNx/Ho4V0GFKPW/w==
@ -6963,12 +6963,13 @@ matrix-events-sdk@0.0.1:
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "31.2.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/1a364c93c3e2d4c211dc9cf374fb80038bab1214"
matrix-js-sdk@31.3.0:
version "31.3.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-31.3.0.tgz#724b0f6677d850d96e651955882d51c56cab7052"
integrity sha512-RwpHQxb8DWBaE7yzrTfSfO1N4jyk6ilcu/Zt3VFqwmeym/0ipVUy98sB2JXOf6E+MdG1w4WzOIxQu2R7GpPZ2g==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-wasm" "^4.1.0"
"@matrix-org/matrix-sdk-crypto-wasm" "^4.3.0"
another-json "^0.2.0"
bs58 "^5.0.0"
content-type "^1.0.4"