summaryrefslogtreecommitdiff
path: root/config/description.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2025-03-01 17:47:12 +0000
committerlain <lain@soykaf.club>2025-03-01 17:47:12 +0000
commit16944eb9dae2b8c41793b5f015ee54818bd939f7 (patch)
tree81eb0ba210f674eb0f6f41cde9b692a27ea96ca0 /config/description.exs
parenta8e863e0d627b6ed9563d953ee2cc8c9f4c9ee7a (diff)
parentaf6d5470d29f294e9b356da36cccbcaf85379f78 (diff)
downloadpleroma-16944eb9dae2b8c41793b5f015ee54818bd939f7.tar.gz
pleroma-16944eb9dae2b8c41793b5f015ee54818bd939f7.zip
Merge branch 'stable' into 'develop'
2.9.0 mergeback See merge request pleroma/pleroma!4332
Diffstat (limited to 'config/description.exs')
-rw-r--r--config/description.exs5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs
index e8d154124..f091e4924 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1772,6 +1772,11 @@ config :pleroma, :config_description, [
type: :integer,
description: "Following handshake timeout",
suggestions: [500]
+ },
+ %{
+ key: :client_api_enabled,
+ type: :boolean,
+ description: "Allow client to server ActivityPub interactions"
}
]
},