Merge branch 'fix/hackney-global-options' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sat, 13 Jul 2019 11:55:09 +0000 (11:55 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sat, 13 Jul 2019 11:55:09 +0000 (11:55 +0000)
commit9497d14f09dc76535dda47fc4257c51ef07a3f56
tree6bbe37740764bde615e18e36f5e36d5e19f49966
parent02cdedbf9fdf27d8dca78caf75f6413cd2566e3e
parent29ffe81c2e2235ed723516e74a50b025af688b9b
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
CHANGELOG.md