diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-10-07 01:34:16 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-10-07 01:34:16 +0000 |
| commit | 5294b11ef092df386b29896e47795edac8364f20 (patch) | |
| tree | 241045eb79c9a21507dc1d008ca4624cb4412f60 /config | |
| parent | 4a3a46074d924f6cd61d06995298caa00184ff18 (diff) | |
| parent | 08d5ad71b68e44334911c63aada418fab2c17df2 (diff) | |
| download | pleroma-5294b11ef092df386b29896e47795edac8364f20.tar.gz pleroma-5294b11ef092df386b29896e47795edac8364f20.zip | |
Merge branch 'feature/mrf-transparency-opt-out' into 'develop'
nodeinfo: allow opting out of MRF transparency
See merge request pleroma/pleroma!370
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 c32ac9da2..320296991 100644 --- a/config/config.exs +++ b/config/config.exs @@ -79,7 +79,8 @@ config :pleroma, :instance, "text/plain", "text/html", "text/markdown" - ] + ], + mrf_transparency: true config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because |