Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2020-05-05 11:39:12 +01:00
commit d5d4b95fee
4 changed files with 120 additions and 60 deletions

View file

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