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

2018-03-20 13:01:30 +00:00 · 2018-03-20 13:01:30 +00:00 · da0d9b5989
parent 8273fba131 6c3b226e58
commit da0d9b5989
1 changed files with 3 additions and 0 deletions
--- a/config.sample.json
+++ b/config.sample.json
@ -27,5 +27,8 @@
        "whitelistedHSUrls": ["https://matrix.org"],
        "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
        "siteId": 1
+    },
+    "enable_presence_by_hs_url": {
+        "https://matrix.org": false
    }
 }