Merge branch 'pool-usage' into 'develop'

Update of hackney and tesla, removal of superflous default options. See merge request pleroma/pleroma!614
2019-01-01 20:12:34 +00:00 · 2019-01-01 20:12:34 +00:00 · 32bed66471
commit 32bed66471
parent 34fa709015 096a927805
4 changed files with 9 additions and 12 deletions
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@ -741,8 +741,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
        {"Content-Type", "application/activity+json"},
        {"signature", signature},
        {"digest", digest}
-      ],
-      hackney: [pool: :default]
+      ]
    )
  end