Merge branch 'master' into develop

This commit is contained in:
Bruno Windels 2019-03-21 11:40:43 +01:00
commit f777c2c9bc
3 changed files with 9 additions and 3 deletions

View file

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