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

diff --combined config/config.exs
index 7bdd6525967ca477e2e611caa769cbf55af38782,cf8d6c2b741d4a5d5bf2667f665ce277b442e2e7..68c0544579803bc96249bd71f325bb944a73f0f0
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -27,8 -27,7 +27,8 @@@ config :logger, :console
  
  config :mime, :types, %{
    "application/xrd+xml" => ["xrd+xml"],
 -  "application/activity+json" => ["activity+json"]
 +  "application/activity+json" => ["activity+json"],
 +  "application/ld+json" => ["activity+json"]
  }
  
  config :pleroma, :websub, Pleroma.Web.Websub
@@@ -50,6 -49,7 +50,7 @@@ config :pleroma, :instance
    name: "Pleroma",
    email: "example@example.com",
    limit: 5000,
+   upload_limit: 16_000_000,
    registrations_open: true,
    federating: true