hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into 'feature/autofollowing'

Browse source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
feld 2020-10-27 17:42:24 +00:00
commit e062329a17
45 changed files with 305 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/description.exs
View file

@ -829,13 +829,7 @@ config :pleroma, :config_description, [
key: :autofollowed_nicknames,
type: {:list, :string},
description:
"Set to nicknames of (local) users that every new user should automatically follow",
suggestions: [
"lain",
"kaniini",
"lanodan",
"rinpatch"
]
"Set to nicknames of (local) users that every new user should automatically follow"
},
%{
key: :autofollowing_nicknames,