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

This commit is contained in:
Weblate 2018-04-30 15:18:30 +00:00
commit e69f7602ea

View file

@ -19,5 +19,8 @@
"piwik": { "piwik": {
"url": "https://piwik.riot.im/", "url": "https://piwik.riot.im/",
"siteId": 1 "siteId": 1
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
} }
} }