Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2020-04-01 15:34:02 +01:00
commit ccd998d709
4 changed files with 24 additions and 7 deletions

View file

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