diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-02-17 17:39:45 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-02-17 17:39:45 +0000 |
| commit | a2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782 (patch) | |
| tree | 6020b41080baf529496a5faf36e1523279a76511 /docs/config.md | |
| parent | 25ab90edeaae53b6ce084d1ba9a02df5505b5041 (diff) | |
| parent | 79e503b3f5ea87c53d4c616ca9ddfa049877705c (diff) | |
| download | pleroma-a2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782.tar.gz | |
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
# Conflicts:
# mix.exs
Diffstat (limited to 'docs/config.md')
| -rw-r--r-- | docs/config.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md index 74badd0da..0c1051dee 100644 --- a/docs/config.md +++ b/docs/config.md @@ -97,6 +97,8 @@ config :pleroma, Pleroma.Mailer, * `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. * `no_attachment_links`: Set to true to disable automatically adding attachment link text to statuses +* `welcome_message`: A message that will be send to a newly registered users as a direct message. +* `welcome_user_nickname`: The nickname of the local user that sends the welcome message. ## :logger * `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog |