Merge branch 'develop' into media-preview-proxy

diff --cc config/config.exs
index e5b7e18dfbea4a9cdcbe574a13dd065badb7850c,1a2b312b500e5b236620a9e24771e49cf0be79ef..1a4b400f6504a7571b4f9cccb91d440aad106a34
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -755,8 -743,8 +752,8 @@@ config :pleroma, :pools
    ],
    media: [
      size: 50,
 -    max_waiting: 10,
 -    recv_timeout: 10_000
 +    max_waiting: 20,
-     timeout: 15_000
++    recv_timeout: 15_000
    ],
    upload: [
      size: 25,

diff --cc config/description.exs
Simple merge

diff --cc mix.lock
Simple merge

diff --cc test/web/mastodon_api/views/account_view_test.exs
Simple merge