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 /config | |
| parent | a38f21f51dc810221cbf910556910a10f6104956 (diff) | |
| parent | 98d9dcd509ab6823e38b3ddbce1f5fc4f3d5a82c (diff) | |
| download | pleroma-74346a7035d950ede143d65f8364194cb116aaf5.tar.gz pleroma-74346a7035d950ede143d65f8364194cb116aaf5.zip | |
Fix merge conflict
Diffstat (limited to 'config')
| -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 9c4d73465..e8cf2ed3a 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 |