mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-09-19 04:31:10 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Weblate 2018-03-20 13:01:30 +00:00
commit da0d9b5989
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.sample.json
View File

@ -27,5 +27,8 @@
"whitelistedHSUrls": ["https://matrix.org"], "whitelistedHSUrls": ["https://matrix.org"],
"whitelistedISUrls": ["https://vector.im", "https://matrix.org"], "whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
"siteId": 1 "siteId": 1
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
} }
} }