Merge branch 'master' into develop

# Conflicts:
#	yarn.lock
This commit is contained in:
ElementRobot 2023-08-01 12:51:00 +01:00
commit 3b37081818
3 changed files with 69 additions and 13 deletions

View file

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.11.36",
"version": "1.11.37",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -74,8 +74,8 @@
"gfm.css": "^1.1.2",
"jsrsasign": "^10.5.25",
"katex": "^0.16.0",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-js-sdk": "27.1.0",
"matrix-react-sdk": "3.77.0",
"matrix-widget-api": "^1.3.1",
"react": "17.0.2",
"react-dom": "17.0.2",