Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2019-09-16 17:59:09 +01:00
commit b0934c9121
4 changed files with 41 additions and 17 deletions

View file

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