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

diff --combined config/config.exs
index 005388c42ea6aa0d6cbb66d48134da73fa218fd1,681b498275d90bdc80ebb5bd28b6100075136a54..e7d1014bb6f5300c17b6dd34e82b0e2f364f8605
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -221,7 -221,6 +221,7 @@@ config :pleroma, :instance
      "text/markdown",
      "text/bbcode"
    ],
 +  staff_transparency: [],
    autofollowed_nicknames: [],
    autofollowing_nicknames: [],
    max_pinned_statuses: 1,
@@@ -350,6 -349,7 +350,7 @@@ config :pleroma, :manifest
  config :pleroma, :activitypub,
    unfollow_blocked: true,
    outgoing_blocks: true,
+   blockers_visible: true,
    follow_handshake_timeout: 500,
    note_replies_output_limit: 5,
    sign_object_fetches: true,