summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-01-28 15:39:14 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-01-28 15:39:14 +0300
commitd3f9e6f6fed382ede8e314c370c21e84a119f65a (patch)
treec8cd63007993d25bb8c17b5b83e8761db9de3295 /config
parent1d2f41642cfec5710055bcf8409778bb362beecb (diff)
parentde0fb88a9cf587b9613e267d5dddfe55b0f414b7 (diff)
downloadpleroma-d3f9e6f6fed382ede8e314c370c21e84a119f65a.tar.gz
pleroma-d3f9e6f6fed382ede8e314c370c21e84a119f65a.zip
[#534] Merged `upstream/develop`.
Diffstat (limited to 'config')
-rw-r--r--config/config.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index c0a936b17..8131d9b18 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -209,6 +209,8 @@ config :pleroma, :gopher,
ip: {0, 0, 0, 0},
port: 9999
+config :pleroma, Pleroma.Web.Metadata, providers: [], unfurl_nsfw: false
+
config :pleroma, :suggestions,
enabled: false,
third_party_engine: