Merge develop to bump elixir version in the CI so I don't get failing formatting

[akkoma] / lib / pleroma / web / rel_me.ex

diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex
index ab29a36e393deb27c4c1dee8c412ef11f6172a40..eaca41132a2ff240b5b9d826fd6e4d38306d5c00 100644 (file)
--- a/lib/pleroma/web/rel_me.ex
+++ b/lib/pleroma/web/rel_me.ex
@@ -5,7 +5,6 @@
 defmodule Pleroma.Web.RelMe do
   @hackney_options [
     pool: :media,
-    timeout: 2_000,
     recv_timeout: 2_000,
     max_body: 2_000_000
   ]