diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-13 11:55:09 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-13 11:55:09 +0000 |
commit | 9497d14f09dc76535dda47fc4257c51ef07a3f56 (patch) | |
tree | 6bbe37740764bde615e18e36f5e36d5e19f49966 /docs/config.md | |
parent | 02cdedbf9fdf27d8dca78caf75f6413cd2566e3e (diff) | |
parent | 29ffe81c2e2235ed723516e74a50b025af688b9b (diff) | |
download | pleroma-9497d14f09dc76535dda47fc4257c51ef07a3f56.tar.gz |
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
Diffstat (limited to 'docs/config.md')
0 files changed, 0 insertions, 0 deletions