Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2022-02-14 15:39:33 +00:00
commit 0304d3245c
3 changed files with 143 additions and 7 deletions

View file

@ -6258,9 +6258,10 @@ matrix-events-sdk@^0.0.1-beta.6:
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1-beta.6.tgz#9001090ed2e2bf29efc113d6b29871bcc6520749"
integrity sha512-VMqPXe3Bg4R9yC9PNqGv6bDFwWlVYadYxp0Ke1ihhXUCpGcx7e28kOYcqK2T3RxLXK4KK7VH4JRbY53Do3r+Fw==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "15.5.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ffab55452adba404f46c3a2ccd43a86f0cd23f8d"
matrix-js-sdk@15.5.1:
version "15.5.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.5.1.tgz#fb67b7f8c74414af71790d1ac0dbb99c1281ec2e"
integrity sha512-7oCrDRZ5NxfimfZgw9cM9a89WxBj1i3cDiwb8PLNv7KnYgnI6z06WUwha2EhohTUd2v69h2AdXSZi2jD6QuHBA==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"