mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
RiotRobot 2021-08-31 14:51:43 +01:00
commit 6d61d481dc
3 changed files with 59 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
yarn.lock
View file

@ -7672,9 +7672,10 @@ mathml-tag-names@^2.1.3:
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "12.3.1"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/92d822d494cc1179affbf1f14fc8635ed5595b3c"
matrix-js-sdk@12.4.0:
version "12.4.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-12.4.0.tgz#ff60306f9a9e39fd1ae6c7e501001f80eb779dd7"
integrity sha512-KamHmvNle4mkdErmNgVsGIL3n8/zgPe60DLVaEA2t4aSNwQLEmRS+oVpIgsO3ZrUivBvn4oc9sBqxP0OIl6kUg==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@ -7695,11 +7696,14 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.28.1"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/94449953054a511d19a14c80a397a518bafc768f"
matrix-react-sdk@3.29.0:
version "3.29.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.29.0.tgz#ab8536fe712b156d911f1f19a89f6c8acca7eafd"
integrity sha512-20Acs/5rs8lhPvFcAza7bFPRZSfm8x3/KILTaQrztIMl1iCSmxLbqJNxhyRjVegLQPEXltdkI3unyKQngn5EYA==
dependencies:
"@babel/runtime" "^7.12.5"
"@sentry/browser" "^6.11.0"
"@sentry/tracing" "^6.11.0"
await-lock "^2.1.0"
blurhash "^1.1.3"
browser-encrypt-attachment "^0.3.0"
@ -7725,7 +7729,7 @@ matrix-mock-request@^1.2.3:
katex "^0.12.0"
linkifyjs "^2.1.9"
lodash "^4.17.20"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-js-sdk "12.4.0"
matrix-widget-api "^0.1.0-beta.15"
minimist "^1.2.5"
opus-recorder "^8.0.3"