Merge branch 'master' into develop

This commit is contained in:
David Baker 2019-03-18 14:20:09 +00:00
commit 42c2692d28
4 changed files with 34 additions and 5 deletions

View file

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