Merge branch 'master' into develop

This commit is contained in:
David Baker 2018-10-29 14:27:46 +00:00
commit 409c48efcb
3 changed files with 23 additions and 4 deletions

View file

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