diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-28 19:03:40 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-28 19:03:40 +0300 |
commit | ba50dc05a8d655deece0aa619aebe1e25dc9d4eb (patch) | |
tree | 4fd9c8ccc64de7b7ab1be6dd0659d34a6daa87d9 /docs/configuration/cheatsheet.md | |
parent | d54233760f4c006d89aa80e0ae78cb6910fc74ab (diff) | |
parent | 342c2e1bc0055b71a9772ef031eab3e8bc88d29b (diff) | |
download | pleroma-ba50dc05a8d655deece0aa619aebe1e25dc9d4eb.tar.gz pleroma-ba50dc05a8d655deece0aa619aebe1e25dc9d4eb.zip |
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'docs/configuration/cheatsheet.md')
-rw-r--r-- | docs/configuration/cheatsheet.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index 0b13d7e88..f4b4b6c3c 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -45,6 +45,7 @@ To add configuration to your config file, you can copy it from the base config. older software for theses nicknames. * `max_pinned_statuses`: The maximum number of pinned statuses. `0` will disable the feature. * `autofollowed_nicknames`: Set to nicknames of (local) users that every new user should automatically follow. +* `autofollowing_nicknames`: Set to nicknames of (local) users that automatically follows every newly registered user. * `attachment_links`: Set to true to enable automatically adding attachment link text to statuses. * `max_report_comment_size`: The maximum size of the report comment (Default: `1000`). * `safe_dm_mentions`: If set to true, only mentions at the beginning of a post will be used to address people in direct messages. This is to prevent accidental mentioning of people when talking about them (e.g. "@friend hey i really don't like @enemy"). Default: `false`. |