gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #11565 from aaronraimist/matrix.org-presence-fix 

Update riot.im enable_presence_by_hs_url for new matrix.org client URL
This commit is contained in:
Travis Ralston 2019-11-29 19:49:57 -07:00 committed by GitHub
parent 86b6123305 942b29c6d7
commit b4829fd3d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.sample.json
View File

@ -47,7 +47,8 @@
"siteId": 1
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
"https://matrix.org": false,
"https://matrix-client.matrix.org": false
},
"settingDefaults": {
"breadcrumbs": true

3
electron_app/riot.im/config.json
View File

@ -34,6 +34,7 @@
"feature_lazyloading": "enable"
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
"https://matrix.org": false,
"https://matrix-client.matrix.org": false
}
}

3
riot.im/app/config.json
View File

@ -26,7 +26,8 @@
]
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
"https://matrix.org": false,
"https://matrix-client.matrix.org": false
},
"terms_and_conditions_links": [
{

3
riot.im/develop/config.json
View File

@ -35,7 +35,8 @@
]
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
"https://matrix.org": false,
"https://matrix-client.matrix.org": false
},
"terms_and_conditions_links": [
{