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

Merge branch 'master' into develop

Browse source
This commit is contained in:
David Baker 2018-10-29 14:27:46 +00:00
commit 409c48efcb
3 changed files with 23 additions and 4 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": "0.17.2",
"version": "0.17.3",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -70,8 +70,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.0",
"matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
"matrix-js-sdk": "0.12.1",
"matrix-react-sdk": "0.14.2",
"modernizr": "^3.6.0",
"prop-types": "^15.6.2",
"react": "^15.6.0",