From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 9 Sep 2020 16:11:36 +0000 (-0500)
Subject: Merge branch 'develop' into media-preview-proxy
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4ee99dafccd6f7c037270d6bac5e942f322c7efd;p=akkoma

Merge branch 'develop' into media-preview-proxy
---

4ee99dafccd6f7c037270d6bac5e942f322c7efd
diff --cc config/config.exs
index e5b7e18df,1a2b312b5..1a4b400f6
--- a/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,