Merge branch 'master' into develop
This commit is contained in:
@@ -2141,10 +2141,10 @@
|
||||
emojibase "^15.0.0"
|
||||
emojibase-data "^15.0.0"
|
||||
|
||||
"@matrix-org/matrix-sdk-crypto-wasm@^4.6.0":
|
||||
version "4.6.0"
|
||||
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-4.6.0.tgz#35224214c7638abbe2bc91fb4fa4fb022a1a2bf0"
|
||||
integrity sha512-v9PFWzSTWMlZKbyk3PPsZjUtOEQ7FIz5USD3lFRUWiS4pv0FOKR125VOUnR5Z/kAty57JXCHDAexCln3zE2Fww==
|
||||
"@matrix-org/matrix-sdk-crypto-wasm@^4.9.0":
|
||||
version "4.9.0"
|
||||
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-4.9.0.tgz#9dfed83e33f760650596c4e5c520e5e4c53355d2"
|
||||
integrity sha512-/bgA4QfE7qkK6GFr9hnhjAvRSebGrmEJxukU0ukbudZcYvbzymoBBM8j3HeULXZT8kbw8WH6z63txYTMCBSDOA==
|
||||
|
||||
"@matrix-org/matrix-wysiwyg@2.17.0":
|
||||
version "2.17.0"
|
||||
@@ -8270,12 +8270,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.6.1"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/514633c5fa0d226b686d607e40a238b5a9237f73"
|
||||
matrix-js-sdk@32.0.0:
|
||||
version "32.0.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-32.0.0.tgz#c038fa41b6a8d265ab7eeb906df3886a56421f5d"
|
||||
integrity sha512-0WsSnls5eEWKgghDFKiVyMylb8dKno+WwiOGGrWyLk+soZLWJvkyUKpYQ/S1v4KxrcaMSx4ZNLVwIlxX0Z0pJg==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
"@matrix-org/matrix-sdk-crypto-wasm" "^4.6.0"
|
||||
"@matrix-org/matrix-sdk-crypto-wasm" "^4.9.0"
|
||||
another-json "^0.2.0"
|
||||
bs58 "^5.0.0"
|
||||
content-type "^1.0.4"
|
||||
@@ -8296,9 +8297,10 @@ matrix-mock-request@^2.5.0:
|
||||
dependencies:
|
||||
expect "^28.1.0"
|
||||
|
||||
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
|
||||
version "3.96.1"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/f8e210f1a0901eb299fcee5381d6cf18f8f22eda"
|
||||
matrix-react-sdk@3.97.0:
|
||||
version "3.97.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.97.0.tgz#4f63ed8d41e543e4d28e49ab196617ac4e43d2d4"
|
||||
integrity sha512-G2KmWt5mGoEMeFsu61F6kiBwjeF2FFUY6gXFJwZxH1RS2oPzmZdjVLP4dIfcItuoodEvxuNCx9tgWS9WaTWT+A==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
"@matrix-org/analytics-events" "^0.12.0"
|
||||
@@ -8342,7 +8344,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.0.0"
|
||||
matrix-widget-api "^1.5.0"
|
||||
memoize-one "^6.0.0"
|
||||
minimist "^1.2.5"
|
||||
|
||||
Reference in New Issue
Block a user