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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Travis Ralston 2021-09-14 14:50:07 -06:00
commit 574e848bf3
3 changed files with 64 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
yarn.lock
View file

@ -7673,8 +7673,8 @@ mathml-tag-names@^2.1.3:
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "12.4.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2783d162b77d6629c574f35e88bea9ae29765c34"
version "12.5.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.5.0.tgz#3899f9d323c457d15a1fe436a2dfa07ae131cce2"
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@ -7696,8 +7696,8 @@ matrix-mock-request@^1.2.3:
expect "^1.20.2"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.29.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/3046f0ed85704ccee3de6d5d663950fe8c72752b"
version "3.30.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.30.0.tgz#8020e71159ffc85a416a2d33e478970f062f7631"
dependencies:
"@babel/runtime" "^7.12.5"
"@sentry/browser" "^6.11.0"