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-08-15 13:37:44 +01:00
commit 6755448e86
3 changed files with 44 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
yarn.lock
View file

@ -8482,10 +8482,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 "27.1.0"
uid b8c19c47ab67f894704a58d3107b8581eb911512
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b8c19c47ab67f894704a58d3107b8581eb911512"
matrix-js-sdk@27.2.0:
version "27.2.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-27.2.0.tgz#c06d5ce9f961b18ed62593e1c01eeaec754725bc"
integrity sha512-jsoA5oPv0eQbELlOzQ6J3v1HTPU0oydqgLQNVpztsajEj6AfJYvCaZueFak8jac9RsopZlqWbP8CXI8r5MvNEA==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-wasm" "^1.2.0"
@ -8509,10 +8509,10 @@ matrix-mock-request@^2.5.0:
dependencies:
expect "^28.1.0"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.77.1"
uid "2b17fc3221b77147db52e47d44cc5015f53926e1"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/2b17fc3221b77147db52e47d44cc5015f53926e1"
matrix-react-sdk@3.78.0:
version "3.78.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.78.0.tgz#f6d7fcc06926713e02a1971532084569b79e3bf1"
integrity sha512-5FnszUIioaNCVCFSQwX6/g5tQOJMjJGlZHn3phE0+Y8ozu4vlODTk3yPf3BkPMwdZqAoo0w/AKRpetKC45e3AA==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/analytics-events" "^0.6.0"
@ -8553,7 +8553,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 "27.2.0"
matrix-widget-api "^1.5.0"
memoize-one "^6.0.0"
minimist "^1.2.5"