summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-07-13 19:06:54 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-13 19:06:54 +0000
commit592411e4fe8a1cf39064e3dd5f9312ed5cdcd22e (patch)
tree0367556f3e87497fe7cff80f70a519cd9e0e6e86 /config
parentf4c001062e51c207bf84f56473ddf6120e3b50fb (diff)
parent0cc638b96874312bce29e477a0ce6e46a92142bf (diff)
downloadpleroma-592411e4fe8a1cf39064e3dd5f9312ed5cdcd22e.tar.gz
pleroma-592411e4fe8a1cf39064e3dd5f9312ed5cdcd22e.zip
Merge branch 'feature/mrf-transparency-filter' into 'develop'
nodeinfo: implement MRF transparency exclusions See merge request pleroma/pleroma!1412
Diffstat (limited to 'config')
-rw-r--r--config/config.exs1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 889238f0f..2ffa8c621 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -240,6 +240,7 @@ config :pleroma, :instance,
"text/bbcode"
],
mrf_transparency: true,
+ mrf_transparency_exclusions: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
no_attachment_links: false,