Merge branch 'master' into develop

2024-08-13 12:13:04 +00:00
parent bdc4ca0cf2 6df8423826
commit 95b2f3ed60
3 changed files with 43 additions and 6 deletions
@@ -1857,6 +1857,11 @@
  dependencies:
    eslint-plugin-unicorn "^54.0.0"

+"@matrix-org/olm@3.2.15":
+  version "3.2.15"
+  resolved "https://registry.yarnpkg.com/@matrix-org/olm/-/olm-3.2.15.tgz#55f3c1b70a21bbee3f9195cecd6846b1083451ec"
+  integrity sha512-S7lOrndAK9/8qOtaTq/WhttJC/o4GAzdfK0MUPpo8ApzsJEC0QjtwrkC3KBXdFP1cD1MXi/mlKR7aaoVMKgs6Q==
+
 "@matrix-org/react-sdk-module-api@^2.4.0":
  version "2.4.0"
  resolved "https://registry.yarnpkg.com/@matrix-org/react-sdk-module-api/-/react-sdk-module-api-2.4.0.tgz#5e4552acbe728141f42c1d54d75dcb4efea9301c"
@@ -6908,12 +6913,14 @@ 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 "34.2.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b8e40ad2a8c26b0cb96def2f95fe16b088530e77"
+matrix-js-sdk@34.3.0:
+  version "34.3.0"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-34.3.0.tgz#9ce3f6c6bb8b1931eec3f9984f4387fef8768001"
+  integrity sha512-vd5j8VUkEmwqGdg7istFsA/ugAaf+cmw2FkgKfefxkEWK4Qx7HZprFnOJK+A6cSqCnBjha4CvHNS4p0D8vmDHw==
  dependencies:
    "@babel/runtime" "^7.12.5"
    "@matrix-org/matrix-sdk-crypto-wasm" "^7.0.0"
+    "@matrix-org/olm" "3.2.15"
    another-json "^0.2.0"
    bs58 "^6.0.0"
    content-type "^1.0.4"