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

Merge branch 'master' into develop

Browse source 
# Conflicts:
#	yarn.lock
This commit is contained in:
RiotRobot 2022-05-24 15:13:38 +01:00
commit 1cdbcf29ce
3 changed files with 106 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
yarn.lock
View file

@ -8215,7 +8215,7 @@ 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-analytics-events@github:matrix-org/matrix-analytics-events.git#a0687ca6fbdb7258543d49b99fb88b9201e900b0":
"matrix-analytics-events@github:matrix-org/matrix-analytics-events#a0687ca6fbdb7258543d49b99fb88b9201e900b0":
version "0.0.1"
resolved "https://codeload.github.com/matrix-org/matrix-analytics-events/tar.gz/a0687ca6fbdb7258543d49b99fb88b9201e900b0"
@ -8229,9 +8229,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 "17.2.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/c7f6777e48cbe2ef3b2b2f1aa1bb3baf936d506e"
matrix-js-sdk@18.0.0:
version "18.0.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-18.0.0.tgz#2452ca9e80e90180de4591960a3a338151c94446"
integrity sha512-P7PI2nQs7BfjkEATgVtQK3ix1DqIYBiDsVo9nSwJcG2vqq+Mf2PnnuPtU6/ZQBoUNhMbFCd8XCaxsPnE6XqnEA==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@ -8253,9 +8254,10 @@ 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.44.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/5f3a9378af9c07b9054bee3fdc728df2c3a93b41"
matrix-react-sdk@3.45.0:
version "3.45.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.45.0.tgz#095aa904bbeea0b485c00e08fa3b2d67d2955ddd"
integrity sha512-YjpHS/Ek7XbqJbk8L20M9e3hjS1EOwL3iinXLllMkueaoTUnQt5P3iVWjhs3MV2k0naGwPCUfh8tTPZQ9A9bQQ==
dependencies:
"@babel/runtime" "^7.12.5"
"@sentry/browser" "^6.11.0"
@ -8293,7 +8295,7 @@ matrix-mock-request@^1.2.3:
matrix-analytics-events "github:matrix-org/matrix-analytics-events.git#a0687ca6fbdb7258543d49b99fb88b9201e900b0"
matrix-encrypt-attachment "^1.0.3"
matrix-events-sdk "^0.0.1-beta.7"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-js-sdk "18.0.0"
matrix-widget-api "^0.1.0-beta.18"
minimist "^1.2.5"
opus-recorder "^8.0.3"