Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2021-10-25 11:45:41 +01:00
commit 90776db423
3 changed files with 112 additions and 7 deletions

View file

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.9.2",
"version": "1.9.3",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -60,8 +60,8 @@
"gfm.css": "^1.1.2",
"jsrsasign": "^10.2.0",
"katex": "^0.12.0",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-js-sdk": "15.0.0",
"matrix-react-sdk": "3.33.0",
"matrix-widget-api": "^0.1.0-beta.16",
"prop-types": "^15.7.2",
"react": "17.0.2",