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 2023-04-11 14:21:47 +01:00
commit b9fd456bf4
3 changed files with 93 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
yarn.lock
View file

@ -8086,10 +8086,10 @@ matrix-events-sdk@0.0.1:
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "24.0.0"
uid "5fb97fcce4caaa1d39ec7ed0c8e29e4b30e1d992"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/5fb97fcce4caaa1d39ec7ed0c8e29e4b30e1d992"
matrix-js-sdk@24.1.0:
version "24.1.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-24.1.0.tgz#6e5ecbadc44cf725c02d32db07f74dcb67b88d11"
integrity sha512-xEx2ZoNsS56dwgqLJ3rIv2SUpFxdQLrLKmJCpMatMUKCAg+NGuZfpQ3QXblIbGaqFNQZCH7fC7S48AeTMZp1Jw==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.6"
@ -8111,10 +8111,10 @@ matrix-mock-request@^2.5.0:
dependencies:
expect "^28.1.0"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.69.1"
uid "692c07ef0a95aa224f8ad7c7c1ba64e0da804285"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/692c07ef0a95aa224f8ad7c7c1ba64e0da804285"
matrix-react-sdk@3.70.0:
version "3.70.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.70.0.tgz#0937895b4f69ec13f728535c532c89de78bdfd18"
integrity sha512-t0mfemzanPW1fSxBoUrq/+zzO3DyClOeLfG/w///JFZBHqA6DV7Y2zQOkWMZkKnWL2eSizkqy4KpNnaU1Zbhqg==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/analytics-events" "^0.5.0"
@ -8153,7 +8153,7 @@ matrix-mock-request@^2.5.0:
maplibre-gl "^2.0.0"
matrix-encrypt-attachment "^1.0.3"
matrix-events-sdk "0.0.1"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-js-sdk "24.1.0"
matrix-widget-api "^1.3.1"
minimist "^1.2.5"
opus-recorder "^8.0.3"