Merge branch 'master' into develop

This commit is contained in:
Luke Barnard 2018-05-09 13:32:06 +01:00
commit 7f50fb3023
4 changed files with 73 additions and 8 deletions

View file

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