Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2019-09-19 17:54:39 +01:00
commit 6bd089c350
4 changed files with 23 additions and 6 deletions

View file

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