summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-09-16 02:25:11 +0000
committerkaniini <nenolod@gmail.com>2018-09-16 02:25:11 +0000
commit22c366a85f2a41c1344b863446491c866c47a8a4 (patch)
treea86b9305ab0ae4ca4847262c231def17db551cfc /config
parent28812752918c59bedc3526c0a4ac7c490d1a5b22 (diff)
parent5acfa2e0919f459beae6ada55d087db8a74949e1 (diff)
downloadpleroma-22c366a85f2a41c1344b863446491c866c47a8a4.tar.gz
pleroma-22c366a85f2a41c1344b863446491c866c47a8a4.zip
Merge branch 'feature/mediaproxy-inline-images' into 'develop'
html: support mediaproxy for inline images Closes #275 See merge request pleroma/pleroma!346
Diffstat (limited to 'config')
-rw-r--r--config/config.exs5
1 files changed, 4 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index d8edc4862..2290119f7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -83,7 +83,10 @@ config :pleroma, :markup,
allow_headings: false,
allow_tables: false,
allow_fonts: false,
- scrub_policy: Pleroma.HTML.Scrubber.Default
+ scrub_policy: [
+ Pleroma.HTML.Transform.MediaProxy,
+ Pleroma.HTML.Scrubber.Default
+ ]
config :pleroma, :fe,
theme: "pleroma-dark",