projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02cdedb 29ffe81)
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)
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

1  2 
CHANGELOG.md patch | diff1 | diff2 | blob | history

diff --cc CHANGELOG.md
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git