diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-17 19:21:54 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-17 19:21:54 +0000 |
| commit | f73b5bd05f26d881bcae8f374b1472a420ff77ea (patch) | |
| tree | e750df82d5d73d6b25a7426937a394798da342a9 /config/config.exs | |
| parent | 9fa761620d7c975db712da2e0b9a93feab6fd3cf (diff) | |
| parent | 849c83ed464e8cbf57c727da8e7b4f8e7daf8fef (diff) | |
| download | pleroma-f73b5bd05f26d881bcae8f374b1472a420ff77ea.tar.gz pleroma-f73b5bd05f26d881bcae8f374b1472a420ff77ea.zip | |
Merge branch 'attachment-links' into 'develop'
Make attachment links configurable
See merge request pleroma/pleroma!677
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 1c55807b7..d30b0aad0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -139,7 +139,8 @@ config :pleroma, :instance, finmoji_enabled: true, mrf_transparency: true, autofollowed_nicknames: [], - max_pinned_statuses: 1 + max_pinned_statuses: 1, + no_attachment_links: false config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because |