mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'release-v1.5.16' into release-v1.6.0

Browse source
This commit is contained in:
RiotRobot 2020-04-15 19:08:28 +01:00
commit 08ef4ff3b1
4 changed files with 35 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "1.5.15",
"version": "1.5.16-rc.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -68,8 +68,8 @@
"favico.js": "^0.3.10",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-js-sdk": "5.3.0-rc.1",
"matrix-react-sdk": "2.4.0-rc.1",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"postcss-easings": "^2.0.0",
"prop-types": "^15.7.2",