summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-09-10 00:23:23 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-09-10 00:24:19 +0000
commit358f88e10a7d3de0481309287b4b756087490dfc (patch)
treea8ef900a25647fd0dfdcb8f3a721d95fab15c478 /config
parent40e2f6e50034e81c3bf509e9dc9f2c938d86445d (diff)
downloadpleroma-358f88e10a7d3de0481309287b4b756087490dfc.tar.gz
pleroma-358f88e10a7d3de0481309287b4b756087490dfc.zip
html: allow inline images by default (because of custom emoji)
Diffstat (limited to 'config')
-rw-r--r--config/config.exs4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index b3889ba12..d5c5b7902 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -77,7 +77,9 @@ config :pleroma, :instance,
managed_config: true
config :pleroma, :markup,
- allow_inline_images: false,
+ # XXX - unfortunately, inline images must be enabled by default right now, because
+ # of custom emoji. Issue #275 discusses defanging that somehow.
+ allow_inline_images: true,
allow_headings: false,
allow_tables: false,
allow_fonts: false,