summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-02-10 20:49:20 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-02-10 20:49:20 +0300
commit6813c0302c2b665d337d5f5831d2df6312b6b277 (patch)
tree8c9333eeff70c799ecd30e6589f3cbebd8adbf5c /config/config.exs
parent2c40c8b4a2890e60abe8d67a3c8af4a88d225b60 (diff)
parent544bdbfb90d764a5aba8ed07c13b842838d76d73 (diff)
downloadpleroma-6813c0302c2b665d337d5f5831d2df6312b6b277.tar.gz
pleroma-6813c0302c2b665d337d5f5831d2df6312b6b277.zip
Merge branch 'develop' into issue/1383
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index 98a44efb0..41c1ff637 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -257,7 +257,8 @@ config :pleroma, :instance,
account_field_name_length: 512,
account_field_value_length: 2048,
external_user_synchronization: true,
- extended_nickname_format: true
+ extended_nickname_format: true,
+ cleanup_attachments: false
config :pleroma, :feed,
post_title: %{
@@ -500,7 +501,6 @@ config :pleroma, :fetch_initial_posts,
config :auto_linker,
opts: [
- scheme: true,
extra: true,
# TODO: Set to :no_scheme when it works properly
validate_tld: true,