Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-11-10 15:21:04 +00:00
commit 25bff3f4b1

View File

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