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

Merge branch 'master' into develop

Browse source 
# Conflicts:
#	package.json
#	yarn.lock
This commit is contained in:
RiotRobot 2022-09-28 14:27:56 +01:00
commit fa966348ee
3 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
yarn.lock
View file

@ -8266,9 +8266,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 "19.6.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/45348a354eb275fe79f4a5ff7407a76dacdcc526"
matrix-js-sdk@19.7.0:
version "19.7.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-19.7.0.tgz#ccadae630c56032b040c87b163475a04601409ce"
integrity sha512-mFN1LBmEpYHCH6II1F8o7y8zJr0kn1yX7ga7tRXHbLJAlBS4bAXRsEoAzdv6OrV8/dS325JlVUYQLHFHQWjYxg==
dependencies:
"@babel/runtime" "^7.12.5"
another-json "^0.2.0"
@ -8289,9 +8290,10 @@ matrix-mock-request@^2.0.0:
dependencies:
expect "^28.1.0"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "3.55.0"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/c14191bfb6200f58b78d6a45bc0ff01d32eaa7af"
matrix-react-sdk@3.56.0:
version "3.56.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.56.0.tgz#28bc382150b0cee959633bebe74c2fdd02bbf5dc"
integrity sha512-VzyhqeoRu1rNhnvpTXYcfFrcqoIVxN19JQHWaeKYj88R6Q94c8Bxdyc59Bhx3J1SlNboEPFbjypNZ8f22HcFwQ==
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/analytics-events" "^0.2.0"
@ -8330,7 +8332,7 @@ matrix-mock-request@^2.0.0:
maplibre-gl "^1.15.2"
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 "19.7.0"
matrix-widget-api "^1.1.1"
minimist "^1.2.5"
opus-recorder "^8.0.3"