Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2022-05-10 15:03:45 +01:00
commit 3d2866917a
3 changed files with 80 additions and 5 deletions

View file

@ -6658,9 +6658,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.1.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/030fcb57a59a04014060ee7574223d6cd9d2ae9c"
matrix-js-sdk@17.2.0:
version "17.2.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-17.2.0.tgz#b757eccbef8676dbb9131f7ee0c31fd8039cc1c6"
integrity sha512-/IrgHCSVUZNVcKoPO20OF9Xog9X79a1ckmR7FwF5lSTNdmC7eQvU0XcFYCi5IXo57du+im69lEw8dLbPngZhoQ==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"