Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers

1 files changed, 15 insertions, 0 deletions

diff --git a/config/description.exs b/config/description.exs
index b993959d7..3f69dac8a 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1473,6 +1473,21 @@ config :pleroma, :config_description, [
   },
   %{
     group: :pleroma,
+    key: :mrf_activity_expiration,
+    label: "MRF Activity Expiration Policy",
+    type: :group,
+    description: "Adds expiration to all local Create Note activities",
+    children: [
+      %{
+        key: :days,
+        type: :integer,
+        description: "Default global expiration time for all local Create activities (in days)",
+        suggestions: [90, 365]
+      }
+    ]
+  },
+  %{
+    group: :pleroma,
     key: :mrf_subchain,
     label: "MRF subchain",
     type: :group,