Merge branch 'develop' into matthew/postcss

This commit is contained in:
Matthew Hodgson 2017-01-18 12:44:42 +00:00
commit 14eec6d982
10 changed files with 193 additions and 49 deletions

View file

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