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 2017-09-21 18:11:46 +01:00
commit 50e6536195
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
package.json
View file

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.12.4",
"version": "0.12.5",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"repository": {
@ -67,7 +67,7 @@
"highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3",
"matrix-js-sdk": "0.8.3",
"matrix-react-sdk": "0.10.4",
"matrix-react-sdk": "0.10.5",
"modernizr": "^3.1.0",
"pako": "^1.0.5",
"prop-types": "^15.5.10",