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

diff --combined config/config.exs
index 6b513a2fedc8f05b8a4d9fa5d5135f9e174ba375,b50c910b12b985ed1c8f6311fc6b8a25c6f8c550..26f039c5e5661e6b8a911640d06ff468fc6efc39
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -221,9 -221,6 +221,9 @@@ config :pleroma, :instance
      "text/markdown",
      "text/bbcode"
    ],
 +  mrf_transparency: true,
 +  mrf_transparency_exclusions: [],
 +  staff_transparency: [],
    autofollowed_nicknames: [],
    autofollowing_nicknames: [],
    max_pinned_statuses: 1,
@@@ -463,7 -460,7 +463,7 @@@ config :pleroma, :shout
    enabled: true,
    limit: 5_000
  
- config :phoenix, :format_encoders, json: Jason
+ config :phoenix, :format_encoders, json: Jason, "activity+json": Jason
  
  config :phoenix, :json_library, Jason