Merge branch 'develop' into feature/bulk-confirmation

[akkoma] / config / description.exs

diff --git a/config/description.exs b/config/description.exs
index 4a5d5f2ea4e891158e207023d2458453b16270b0..ac3dfbb2b54939a19af073e5ec2330ab60e74fa4 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -270,6 +270,19 @@ config :pleroma, :config_description, [
       }
     ]
   },
+  %{
+    group: :pleroma,
+    key: :fed_sockets,
+    type: :group,
+    description: "Websocket based federation",
+    children: [
+      %{
+        key: :enabled,
+        type: :boolean,
+        description: "Enable FedSockets"
+      }
+    ]
+  },
   %{
     group: :pleroma,
     key: Pleroma.Emails.Mailer,
@@ -2432,7 +2445,7 @@ config :pleroma, :config_description, [
   %{
     group: :pleroma,
     key: Pleroma.Formatter,
-    label: "Auto Linker",
+    label: "Linkify",
     type: :group,
     description:
       "Configuration for Pleroma's link formatter which parses mentions, hashtags, and URLs.",