Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2021-05-17 14:00:15 +01:00
commit 304fccaec4
3 changed files with 126 additions and 52 deletions

View file

@ -1,6 +1,6 @@
{
"name": "element-web",
"version": "1.7.27",
"version": "1.7.28",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -59,8 +59,8 @@
"highlight.js": "^10.5.0",
"jsrsasign": "^10.1.5",
"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": "11.0.0",
"matrix-react-sdk": "3.21.0",
"matrix-widget-api": "^0.1.0-beta.13",
"olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
"prop-types": "^15.7.2",