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

diff --combined config/config.exs
index 8e3d7822430f67da0ecf64296b04449cbce34a43,4381068ac34afa3fa488672f5716a777bbc7b427..dc9ae59aeb9e9eb1c8a9502973bfb364ca164830
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -222,9 -222,6 +222,9 @@@ config :pleroma, :instance
      "text/markdown",
      "text/bbcode"
    ],
 +  mrf_transparency: true,
 +  mrf_transparency_exclusions: [],
 +  staff_transparency: [],
    autofollowed_nicknames: [],
    autofollowing_nicknames: [],
    max_pinned_statuses: 1,
@@@ -412,6 -409,8 +412,8 @@@ config :pleroma, :mrf_object_age
    threshold: 604_800,
    actions: [:delist, :strip_followers]
  
+ config :pleroma, :mrf_follow_bot, follower_nickname: nil
+ 
  config :pleroma, :rich_media,
    enabled: true,
    ignore_hosts: [],