Merge branch 'master' into develop
This commit is contained in:
commit
c2fa3d8f04
3 changed files with 45 additions and 13 deletions
22
yarn.lock
22
yarn.lock
|
@ -1806,9 +1806,9 @@
|
|||
emojibase-data "^15.0.0"
|
||||
|
||||
"@matrix-org/matrix-sdk-crypto-wasm@^3.5.0":
|
||||
version "3.5.0"
|
||||
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-3.5.0.tgz#997d63ae12304142513fe93c5e0872ff10ca30b4"
|
||||
integrity sha512-7as0jJTje+rFu9AF8LEO0tmhtHcou2YQnZOtpiP+lS5rDfIPv5CL8/eb45fzDnbQybt9Jm5zdjBdiLBEaUg2dQ==
|
||||
version "3.6.0"
|
||||
resolved "https://registry.yarnpkg.com/@matrix-org/matrix-sdk-crypto-wasm/-/matrix-sdk-crypto-wasm-3.6.0.tgz#385aa579d7b7546d85c9b20bf6ba780f799bdda3"
|
||||
integrity sha512-fvuYczcp/r/MOkOAUbK+tMaTerEe7/QHGQcRJz3W3JuEma0YN59d35zTBlts7EkN6Ichw1vLSyM+GkcbuosuyA==
|
||||
|
||||
"@matrix-org/matrix-wysiwyg@2.17.0":
|
||||
version "2.17.0"
|
||||
|
@ -8585,9 +8585,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 "30.3.0"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ffc9fb34d057b7258e40891f8614ec09321d82d7"
|
||||
matrix-js-sdk@31.0.0:
|
||||
version "31.0.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-31.0.0.tgz#2aacab066466f33b0aa956b8a2c765bfe1bde384"
|
||||
integrity sha512-2TqDwEK34NFS0uiOti02CBCupwJcAIxWarOSD0yIrgMpIwSVNB795jEnXxNXz+bgPKsepDmiqeg2DrlinIoW1w==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
"@matrix-org/matrix-sdk-crypto-wasm" "^3.5.0"
|
||||
|
@ -8611,9 +8612,10 @@ matrix-mock-request@^2.5.0:
|
|||
dependencies:
|
||||
expect "^28.1.0"
|
||||
|
||||
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
|
||||
version "3.88.0"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/9350583ecf151811c8377879af0b08d4db701c30"
|
||||
matrix-react-sdk@3.89.0:
|
||||
version "3.89.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.89.0.tgz#b3ab4d15f1e4740218be688e48ea48693c8670bb"
|
||||
integrity sha512-Uc1CP8u5IqGObZlNnVYEwHqAk26Tg3vkSXH2RXYFh37R/Hv7CJu50/YXLor40aGb+hOMwQytuzPkxrcc1/RdMw==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.12.5"
|
||||
"@matrix-org/analytics-events" "^0.9.0"
|
||||
|
@ -8656,7 +8658,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 "31.0.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