Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2020-03-04 13:06:43 +00:00
commit d88f9ed2c0
5 changed files with 18 additions and 8 deletions

View file

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