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

Merge branch 'develop' into webpack4

Browse source
This commit is contained in:
David Baker 2018-05-11 16:27:50 +01:00 • committed by GitHub
commit 8f4953c182
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 95 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
package.json
View file

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.14.1",
"version": "0.14.2",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -59,9 +59,13 @@
"bluebird": "^3.5.0",
"browser-request": "^0.3.3",
"extract-text-webpack-plugin": "^4.0.0-beta.0",
"draft-js": "^0.11.0-alpha",
"favico.js": "^0.3.10",
"matrix-js-sdk": "0.10.1",
"matrix-react-sdk": "0.12.2",
"gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
"gfm.css": "^1.1.1",
"highlight.js": "^9.0.0",
"matrix-js-sdk": "0.10.2",
"matrix-react-sdk": "0.12.4-rc.1",
"modernizr": "^3.1.0",
"prop-types": "^15.5.10",
"react": "^15.6.0",