Merge branch 'master' into develop

2018-11-13 19:02:34 +00:00
parent 061838bdab 4a217d9e9f
commit cc4d0af713
3 changed files with 8 additions and 2 deletions
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
  "name": "riot-web",
  "productName": "Riot",
  "main": "src/electron-main.js",
-  "version": "0.17.4",
+  "version": "0.17.5",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "dependencies": {