Merge branch 'master' into develop

This commit is contained in:
David Baker 2017-06-22 12:08:14 +01:00
commit 8b65b96adf
3 changed files with 14 additions and 4 deletions

View file

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