Merge branch 'master' into develop

# 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

View file

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.11.46",
"version": "1.11.47",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -76,8 +76,8 @@
"jsrsasign": "^10.5.25",
"katex": "^0.16.0",
"lodash": "^4.17.21",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-js-sdk": "29.1.0",
"matrix-react-sdk": "3.83.0",
"matrix-widget-api": "^1.3.1",
"react": "17.0.2",
"react-dom": "17.0.2",