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

2018-04-30 15:18:30 +00:00 · 2018-04-30 15:18:30 +00:00 · e69f7602ea
commit e69f7602ea
parent d2e4d3bc1c 0e2ee5f127
1 changed files with 3 additions and 0 deletions
--- a/electron_app/riot.im/config.json
+++ b/electron_app/riot.im/config.json
@ -19,5 +19,8 @@
    "piwik": {
        "url": "https://piwik.riot.im/",
        "siteId": 1
+    },
+    "enable_presence_by_hs_url": {
+        "https://matrix.org": false
    }
 }