Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2021-08-31 14:51:43 +01:00
commit 6d61d481dc
3 changed files with 59 additions and 10 deletions

View file

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.8.1",
"version": "1.8.2",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -61,8 +61,8 @@
"highlight.js": "^10.5.0",
"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": "12.4.0",
"matrix-react-sdk": "3.29.0",
"matrix-widget-api": "^0.1.0-beta.15",
"prop-types": "^15.7.2",
"react": "^17.0.2",