Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2019-06-19 16:03:22 +01:00
commit 6f1ce750bf
4 changed files with 64 additions and 13 deletions

View file

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