Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2022-02-14 15:53:03 +00:00
commit 5552ac0624
3 changed files with 140 additions and 4 deletions

View file

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.10.1",
"version": "1.10.2",
"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.5.1",
"matrix-react-sdk": "3.40.0",
"matrix-widget-api": "^0.1.0-beta.18",
"prop-types": "^15.7.2",
"react": "17.0.2",