Merge branch 'master' into develop

# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
ElementRobot
2023-09-12 17:16:37 +01:00
3 changed files with 46 additions and 8 deletions
+9 -7
View File
@@ -8886,9 +8886,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 "28.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/2918d686aee05bdc702fd765da16c74fd58c2a7e"
matrix-js-sdk@28.1.0:
version "28.1.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-28.1.0.tgz#0e4640a93f19f5768e6bddf870a95e5be02257db"
integrity sha512-GwhsOAka40i7hc+Hm/tiJdDgMgx/BWLGQmKQAcqFk4E2uxlB0k01D+cyLhRvmfiwlRbdABohGgqSiQRL7LD98w==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-wasm" "^1.2.1"
@@ -8912,9 +8913,10 @@ matrix-mock-request@^2.5.0:
dependencies:
expect "^28.1.0"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.79.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/85be845f1664abbaa9d37ff111983445f215c958"
matrix-react-sdk@3.80.0:
version "3.80.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.80.0.tgz#bc964eaba886af365920ed37a4649a4ab2ac5608"
integrity sha512-7F1CzrVR/y0I7JFl1ckRph2ADryXA++t7jVgbQJWM0XR4VoGI/qCRzfVtEnwknPlMZ2vdr82nopp0pY1IxYKJQ==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/analytics-events" "^0.7.0"
@@ -8955,7 +8957,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 "28.1.0"
matrix-widget-api "^1.5.0"
memoize-one "^6.0.0"
minimist "^1.2.5"