diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-01-09 16:56:31 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-01-09 16:56:31 +0700 |
| commit | 48591aab980d92823b51d2363fcd4b64d311739a (patch) | |
| tree | 0bceebfbc8e96c7999683168b62b1e4f88272625 /docs/config.md | |
| parent | 0c750bc432a6329be7f0dc15707e46625b11faf3 (diff) | |
| parent | 5c5c8508c203886f32b150e7d8c1f7362a4fde0e (diff) | |
| download | pleroma-48591aab980d92823b51d2363fcd4b64d311739a.tar.gz pleroma-48591aab980d92823b51d2363fcd4b64d311739a.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
# Conflicts:
# docs/config.md
Diffstat (limited to 'docs/config.md')
| -rw-r--r-- | docs/config.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/config.md b/docs/config.md index f1bb8d86c..7eb2d5671 100644 --- a/docs/config.md +++ b/docs/config.md @@ -32,7 +32,7 @@ This filter replaces the filename (not the path) of an upload. For complete obfu ## Pleroma.Mailer * `adapter`: one of the mail adapters listed in [Swoosh readme](https://github.com/swoosh/swoosh#adapters), or `Swoosh.Adapters.Local` for in-memory mailbox. -* `api_key` / `password` and / or other adapter-specific settings, per the above documentation. +* `api_key` / `password` and / or other adapter-specific settings, per the above documentation. An example for Sendgrid adapter: @@ -94,6 +94,7 @@ config :pleroma, Pleroma.Mailer, * `extended_nickname_format`: Set to `true` to use extended local nicknames format (allows underscores/dashes). This will break federation with 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. ## :logger * `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog |