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:
ElementRobot 2023-10-24 15:46:10 +01:00
commit b8775f48f7
3 changed files with 48 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
yarn.lock
View file

@ -8850,10 +8850,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 "29.0.0"
uid "6468d794582698f96742a71fcc4845c4dfd90aa6"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/6468d794582698f96742a71fcc4845c4dfd90aa6"
matrix-js-sdk@29.1.0:
version "29.1.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-29.1.0.tgz#4d1dd66575e77030a6446f033e86dd203d08b7b5"
integrity sha512-nF+ACFioDltGCf2KFfXK7QoJ70Ytnzm4Jse2UI+BDXeR9WCjtKefXJtboN2rmU4MFmLCTHcnBTmu6yig67YUqw==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-wasm" "^2.0.0"
@ -8877,10 +8877,10 @@ matrix-mock-request@^2.5.0:
dependencies:
expect "^28.1.0"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.82.0"
uid "888d01cad8ba5e180537b7d85d60f43e3334d015"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/888d01cad8ba5e180537b7d85d60f43e3334d015"
matrix-react-sdk@3.83.0:
version "3.83.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.83.0.tgz#301da45291c8eb12b98accd2cecb77f7e13d35d5"
integrity sha512-gJ5I/otFUoGijPqWWZoWxBRE7JRVPEhxOt5ZAMXSrhHfWJ0no6C2vq39mZJjit4nEl0ncDBIH0zTXrY1BBjBTA==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/analytics-events" "^0.7.0"
@ -8923,7 +8923,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 "29.1.0"
matrix-widget-api "^1.5.0"
memoize-one "^6.0.0"
minimist "^1.2.5"