Merge branch 'develop' into travis/sourcemaps

This commit is contained in:
Travis Ralston
2020-01-13 11:21:51 -07:00
12 changed files with 1041 additions and 880 deletions

View File

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