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:
#	CHANGELOG.md
#	package.json
This commit is contained in:
RiotRobot 2022-08-02 17:12:24 +01:00
commit dff1a1405d
3 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
yarn.lock
View file

@ -6771,10 +6771,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@19.2.0-rc.1:
version "19.2.0-rc.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.2.0-rc.1.tgz#6ee0d405e118972bb2e78a4e1e13cdbe1ce5c137"
integrity sha512-diwL/V+lAnkU3mE7qYVjRxZnXHAIznFG186ftcebSTfVEgkyfyPBEwG/xMchxUx+cOjC1Ume6gu0u3AzRgMIMg==
matrix-js-sdk@19.2.0:
version "19.2.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.2.0.tgz#ea8e54adbfa18ddea2737ffdc7381c83bf641101"
integrity sha512-alvTasCTCo/XXSIkKEj8xKe1NMsyiVDDVIQdU9ZHI1aePq+DrAcx8CqB7L/dgjk842v+63Eke1f/jZuFWvjn4w==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"