Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2022-04-26 11:50:38 +01:00
commit ba624c8ef2
4 changed files with 69 additions and 11 deletions

View file

@ -6643,9 +6643,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 "17.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/db58a66e19608683682a780c777c606af68bc205"
matrix-js-sdk@17.1.0:
version "17.1.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.1.0.tgz#15335b2f8987c7a7f1b5ef91432f981dbe052fc7"
integrity sha512-1MZYo+B4FnZMII1/Mw0E7WX4erCxnPpeA8fankY5Ql82LQQVSnceOpX2XAsRlDHcxcdExB929KKqVrk/eqDM/A==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"