gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #13179 from vector-im/jryans/enable-cross-signing 

Enable cross-signing / E2EE by default for DM on release
This commit is contained in:
J. Ryan Stinnett 2020-04-15 18:54:02 +01:00 committed by GitHub
parent 1a4fe2ac3b cd19af4003
commit b5e8e5cf75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,14 +23,8 @@
"siteId": 1, "siteId": 1,
"policyUrl": "https://matrix.org/legal/riot-im-cookie-policy" "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
}, },
"phasedRollOut": {
"feature_lazyloading": {
"offset": 1539684000000,
"period": 604800000
}
},
"features": { "features": {
"feature_lazyloading": "enable" "feature_cross_signing": "enable"
}, },
"enable_presence_by_hs_url": { "enable_presence_by_hs_url": {
"https://matrix.org": false, "https://matrix.org": false,

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

@ -13,6 +13,7 @@
"hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web", "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit", "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": { "features": {
"feature_cross_signing": "enable"
}, },
"piwik": { "piwik": {
"url": "https://piwik.riot.im/", "url": "https://piwik.riot.im/",