Merge branch 'develop' into matthew/postcss
This commit is contained in:
commit
14eec6d982
10 changed files with 193 additions and 49 deletions
|
@ -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": {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue