Merge branch 'master' into develop

(Keep react-sdk and js-sdk on develop)
This commit is contained in:
Richard van der Hoff 2017-02-04 11:04:25 +00:00
commit af765c7522
2 changed files with 16 additions and 2 deletions

View file

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