diff options
author | rinpatch <rinpatch@sdf.org> | 2019-01-18 18:31:25 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-01-18 18:31:25 +0300 |
commit | 74346a7035d950ede143d65f8364194cb116aaf5 (patch) | |
tree | f058b3fc2edd6868511bc6f832f75374bdbd117e /docs/config.md | |
parent | a38f21f51dc810221cbf910556910a10f6104956 (diff) | |
parent | 98d9dcd509ab6823e38b3ddbce1f5fc4f3d5a82c (diff) | |
download | pleroma-74346a7035d950ede143d65f8364194cb116aaf5.tar.gz |
Fix merge conflict
Diffstat (limited to 'docs/config.md')
-rw-r--r-- | docs/config.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md index b9ad2aef7..5464fa90d 100644 --- a/docs/config.md +++ b/docs/config.md @@ -95,6 +95,7 @@ config :pleroma, Pleroma.Mailer, 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. +* `no_attachment_links`: Set to true to disable automatically adding attachment link text to statuses ## :logger * `backends`: `:console` is used to send logs to stdout, `{ExSyslogger, :ex_syslogger}` to log to syslog |