From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Sat, 13 Jul 2019 11:55:09 +0000 (+0000)
Subject: Merge branch 'fix/hackney-global-options' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9497d14f09dc76535dda47fc4257c51ef07a3f56;p=akkoma

Merge branch 'fix/hackney-global-options' into 'develop'

Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues

See merge request pleroma/pleroma!1409
---

9497d14f09dc76535dda47fc4257c51ef07a3f56