From: sadposter <hannah+pleroma@coffee-and-dreams.uk>
Date: Sun, 1 Nov 2020 12:22:28 +0000 (+0000)
Subject: Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=ddf36b096e3f6e2fa1cdca5d59db98ade696df20;p=akkoma

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
---

ddf36b096e3f6e2fa1cdca5d59db98ade696df20
diff --cc config/config.exs
index 584fb2ffa,c0b6ac1d6..5739095f0
--- a/config/config.exs
+++ b/config/config.exs
@@@ -234,10 -233,8 +233,11 @@@ config :pleroma, :instance
      "text/markdown",
      "text/bbcode"
    ],
 +  mrf_transparency: true,
 +  mrf_transparency_exclusions: [],
 +  staff_transparency: [],
    autofollowed_nicknames: [],
+   autofollowing_nicknames: [],
    max_pinned_statuses: 1,
    attachment_links: false,
    max_report_comment_size: 1000,