diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/http/connection.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex index b798eaa5a..cc2e96e2b 100644 --- a/lib/pleroma/http/connection.ex +++ b/lib/pleroma/http/connection.ex @@ -31,6 +31,6 @@ defmodule Pleroma.HTTP.Connection do # defp hackney_options(opts) do options = Keyword.get(opts, :adapter, []) - @hackney_options ++ options + Keyword.merge(@hackney_options, options) end end |