diff --git a/config.sample.json b/config.sample.json deleted file mode 100644 index ac22b5bf..00000000 --- a/config.sample.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "default_server_config": { - "m.homeserver": { - "base_url": "https://matrix.org", - "server_name": "matrix.org" - }, - "m.identity_server": { - "base_url": "https://vector.im" - } - }, - "disable_custom_urls": false, - "disable_guests": false, - "disable_login_language_selector": false, - "disable_3pid_login": false, - "brand": "Riot", - "integrations_ui_url": "https://scalar.vector.im/", - "integrations_rest_url": "https://scalar.vector.im/api", - "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html", - "bug_report_endpoint_url": "https://riot.im/bugreports/submit", - "defaultCountryCode": "GB", - "showLabsSettings": false, - "features": { - "feature_groups": "labs", - "feature_pinning": "labs", - "feature_reactions": "labs", - "feature_message_editing": "labs" - }, - "default_federate": true, - "default_theme": "light", - "roomDirectory": { - "servers": [ - "matrix.org" - ] - }, - "welcomeUserId": "@riot-bot:matrix.org", - "piwik": { - "url": "https://piwik.riot.im/", - "whitelistedHSUrls": ["https://matrix.org"], - "whitelistedISUrls": ["https://vector.im", "https://matrix.org"], - "siteId": 1 - }, - "enable_presence_by_hs_url": { - "https://matrix.org": false - } -} diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index a5a38c86..8fc45a29 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -22,6 +22,5 @@ "Need help?": "Need help?", "Chat with Riot Bot": "Chat with Riot Bot", "Explore rooms": "Explore rooms", - "Push-to-Talk": "Push-to-Talk", "Room Directory": "Room Directory" }