Merge branch 'master' into develop
This commit is contained in:
commit
c50556a957
3 changed files with 41 additions and 12 deletions
20
yarn.lock
20
yarn.lock
|
@ -2185,7 +2185,7 @@
|
|||
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.3.0":
|
||||
"@matrix-org/react-sdk-module-api@^2.3.0", "@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"
|
||||
integrity sha512-cPb+YaqllfJkRX0ofcG/0YdHxCvcMAvUbdNMO2olpGL8vwbBP6mHdhbZ87z9pgsRIVOqfFuLUE3WeW0hxWrklQ==
|
||||
|
@ -8301,9 +8301,10 @@ 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 "32.0.0"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/82ed7bd86ae4c8c703f886a490573110035cfe34"
|
||||
matrix-js-sdk@32.1.0:
|
||||
version "32.1.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-32.1.0.tgz#b5cb79cc838c450d44d01de1ac58b6cda63b20b9"
|
||||
integrity sha512-+jRCQKOBuMvAz3nWsf5NGWpttByeC/gw1It1gCZLQsWix6jN1bkHiqwk6OOvcGj4I5ML2bOEbYEr46bcqFUouQ==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
"@matrix-org/matrix-sdk-crypto-wasm" "^4.9.0"
|
||||
|
@ -8327,16 +8328,17 @@ matrix-mock-request@^2.5.0:
|
|||
dependencies:
|
||||
expect "^28.1.0"
|
||||
|
||||
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
|
||||
version "3.97.0"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/0daf0cfa8070fc6ee9a20d39faf42fc64824de25"
|
||||
matrix-react-sdk@3.98.0:
|
||||
version "3.98.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.98.0.tgz#20bde52244f78f1bc0c8be029dae63d6419caa53"
|
||||
integrity sha512-RUeFLg1Y6HSpvXvML7nfMUFtACe0ubAALAusU8KEW3rUJrPuRFtSVCe1g1KpwS3huEZHA38vi17B1CwDcEvfPQ==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
"@matrix-org/analytics-events" "^0.19.0"
|
||||
"@matrix-org/emojibase-bindings" "^1.1.2"
|
||||
"@matrix-org/matrix-wysiwyg" "2.17.0"
|
||||
"@matrix-org/olm" "3.2.15"
|
||||
"@matrix-org/react-sdk-module-api" "^2.3.0"
|
||||
"@matrix-org/react-sdk-module-api" "^2.4.0"
|
||||
"@matrix-org/spec" "^1.7.0"
|
||||
"@sentry/browser" "^7.0.0"
|
||||
"@testing-library/react-hooks" "^8.0.1"
|
||||
|
@ -8373,7 +8375,7 @@ matrix-mock-request@^2.5.0:
|
|||
maplibre-gl "^2.0.0"
|
||||
matrix-encrypt-attachment "^1.0.3"
|
||||
matrix-events-sdk "0.0.1"
|
||||
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
|
||||
matrix-js-sdk "32.1.0"
|
||||
matrix-widget-api "^1.5.0"
|
||||
memoize-one "^6.0.0"
|
||||
minimist "^1.2.5"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue