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

This commit is contained in:
Michael Telatynski 2017-05-24 10:56:36 +01:00
commit c63e429c76
4 changed files with 117 additions and 4 deletions

View file

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