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

diff --cc .gitignore
Simple merge

diff --cc config/config.exs
index 584fb2ffa1431f7727e87599ba276c0efc96cf76,c0b6ac1d66fe03ab2ba6c180f217d22949846d23..5739095f0f85e16a60fe745ee9a9e2abd2822bfb
--- 1/config/config.exs
--- 2/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,

diff --cc lib/mix/tasks/pleroma/user.ex
Simple merge