summaryrefslogtreecommitdiff
path: root/config/description.exs
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-10-28 15:33:36 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-10-28 15:33:36 +0400
commit4a2d7a7a5db2544ffc84e1f0eb0dc86e1cb3c32c (patch)
treebe6180594d4416c53670799ca3d0a11696b2dbdd /config/description.exs
parent4f90077767b416f3469fe7c8acfaa6932c579ec2 (diff)
parent1204aaa2e35983f7361d61ee7906ccf3d09d84e4 (diff)
downloadpleroma-4a2d7a7a5db2544ffc84e1f0eb0dc86e1cb3c32c.tar.gz
pleroma-4a2d7a7a5db2544ffc84e1f0eb0dc86e1cb3c32c.zip
Merge remote-tracking branch 'origin/develop' into feature/account-export
Diffstat (limited to 'config/description.exs')
-rw-r--r--config/description.exs6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs
index 0e8285280..8861cddea 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -832,6 +832,12 @@ config :pleroma, :config_description, [
"Set to nicknames of (local) users that every new user should automatically follow"
},
%{
+ key: :autofollowing_nicknames,
+ type: {:list, :string},
+ description:
+ "Set to nicknames of (local) users that automatically follows every newly registered user"
+ },
+ %{
key: :attachment_links,
type: :boolean,
description: "Enable to automatically add attachment link text to statuses"