merge from upstream

1 files changed, 0 insertions, 49 deletions

diff --git a/app/config/configuration/chat/riot_web/config.json b/app/config/configuration/chat/riot_web/config.json
deleted file mode 100644
index 9c898f0..0000000
--- a/app/config/configuration/chat/riot_web/config.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "default_server_config": {
-        "m.homeserver": {
-            "base_url": "https://im.deuxfleurs.fr",
-            "server_name": "deuxfleurs.fr"
-        },
-        "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": "Deuxfleurs",
-    "integrations_ui_url": "https://scalar.vector.im/",
-    "integrations_rest_url": "https://scalar.vector.im/api",
-    "integrations_widgets_urls": [
-        "https://scalar.vector.im/_matrix/integrations/v1",
-        "https://scalar.vector.im/api",
-        "https://scalar-staging.vector.im/_matrix/integrations/v1",
-        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api"
-    ],
-    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
-    "defaultCountryCode": "FR",
-    "showLabsSettings": true,
-    "features": {
-        "feature_new_spinner": true,
-        "feature_groups": "labs",
-        "feature_pinning": "labs"
-    },
-    "default_federate": true,
-    "default_theme": "light",
-    "roomDirectory": {
-        "servers": [
-            "deuxfleurs.fr",
-            "matrix.org",
-            "tedomum.net",
-            "zinz.dev"
-        ]
-    },
-    "settingDefaults": {
-        "breadcrumbs": true
-    },
-    "jitsi": {
-        "preferredDomain": "jitsi.deuxfleurs.fr"
-    }
-}