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

Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff

Browse source
This commit is contained in:
Michael Telatynski 2017-06-20 14:32:19 +01:00
commit fe1b0b5cd8
48 changed files with 2148 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

2
electron_app/package.json
View file

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "0.10.2",
"version": "0.11.3",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {