Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2022-10-11 14:09:34 +01:00
commit f0e6673fec
3 changed files with 41 additions and 10 deletions

View file

@ -8264,9 +8264,10 @@ matrix-events-sdk@^0.0.1-beta.7:
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.7.tgz#5ffe45eba1f67cc8d7c2377736c728b322524934"
integrity sha512-9jl4wtWanUFSy2sr2lCjErN/oC8KTAtaeaozJtrgot1JiQcEI4Rda9OLgQ7nLKaqb4Z/QUx/fR3XpDzm5Jy1JA==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "20.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/83fca5b57d8fe1b8c18444129a2e2318129753d5"
matrix-js-sdk@20.1.0:
version "20.1.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-20.1.0.tgz#d235c9125a79901e7e0eb667178bbbdb26710266"
integrity sha512-AjuWVmerJ8aEAIgD6QfmSIg0RrvA8vzvOV+ycvSGg4DgiFlVZbFvBxkVZTRdZ5icJe1/XMaCEf5OZ9Ha2hXUUg==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@ -8287,9 +8288,10 @@ matrix-mock-request@^2.0.0:
dependencies:
expect "^28.1.0"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.57.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/1a0dbbf1925d5112ddb844ed9ca3fbc49bbb85e8"
matrix-react-sdk@3.58.0:
version "3.58.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.58.0.tgz#3352ab9e5c001c47d89c4472123216ab734e4cbf"
integrity sha512-JKKNeky8WOUTKknKyPaXiWTk4wUNiMQu/ZET8yUu0quPv8Ls20f2skgVHEMqFQ+lKdWk07iGClag8WCWwppx8A==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/analytics-events" "^0.2.0"
@ -8328,7 +8330,7 @@ matrix-mock-request@^2.0.0:
maplibre-gl "^1.15.2"
matrix-encrypt-attachment "^1.0.3"
matrix-events-sdk "^0.0.1-beta.7"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-js-sdk "20.1.0"
matrix-widget-api "^1.1.1"
minimist "^1.2.5"
opus-recorder "^8.0.3"