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

This commit is contained in:
Weblate 2018-01-08 21:33:27 +00:00
commit 89c5be39d1

View File

@ -4,7 +4,7 @@
"main": "electron_app/src/electron-main.js",
"version": "0.13.4",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"author": "New Vector Ltd.",
"repository": {
"type": "git",
"url": "https://github.com/vector-im/riot-web"