Merge branch 'master' into develop

This commit is contained in:
David Baker 2019-03-06 11:38:17 +00:00
commit b2d417d7ef
7 changed files with 60 additions and 20 deletions

View file

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