imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source 
# Conflicts:
#	package.json
This commit is contained in:
RiotRobot 2022-08-16 15:42:37 +01:00
commit 5b2bafacc9
3 changed files with 40 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
yarn.lock
View file

@ -6786,9 +6786,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 "19.2.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/cf33569a2187628dd7954ac771995cce3e804af4"
matrix-js-sdk@19.3.0:
version "19.3.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.3.0.tgz#1a9ea66201ae349eb95039b3a63780c7d6607313"
integrity sha512-ZhYfDdnqujEFeZe+ek5SdxUgWXQBq2OaOgWnQwG4jD00ANdTmeBKlDsNCjOwefyD6UQ1G/oM2W/YVEghihAT1g==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"