Merge pull request from vector-im/jryans/rm-cross-signing-flags-config

Remove unused feature flag from config
This commit is contained in:
J. Ryan Stinnett 2020-05-05 14:42:38 +01:00 committed by GitHub
commit add2458a45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 3 deletions
electron_app/riot.im
riot.im

View File

@ -24,7 +24,6 @@
"policyUrl": "https://matrix.org/legal/riot-im-cookie-policy" "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
}, },
"features": { "features": {
"feature_cross_signing": "enable"
}, },
"enable_presence_by_hs_url": { "enable_presence_by_hs_url": {
"https://matrix.org": false, "https://matrix.org": false,

View File

@ -13,7 +13,6 @@
"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/",

View File

@ -20,7 +20,6 @@
"feature_many_integration_managers": "labs", "feature_many_integration_managers": "labs",
"feature_mjolnir": "labs", "feature_mjolnir": "labs",
"feature_dm_verification": "labs", "feature_dm_verification": "labs",
"feature_cross_signing": "enable",
"feature_bridge_state": "labs", "feature_bridge_state": "labs",
"feature_presence_in_room_list": "labs", "feature_presence_in_room_list": "labs",
"feature_custom_themes": "labs" "feature_custom_themes": "labs"