Merge branch 'master' into develop

This commit is contained in:
David Baker 2018-11-13 19:02:34 +00:00
commit cc4d0af713
3 changed files with 8 additions and 2 deletions

View file

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