Merge branch 'default-to-hackney-again' into 'develop'
authorlain <lain@soykaf.club>
Mon, 1 Jun 2020 13:24:03 +0000 (13:24 +0000)
committerlain <lain@soykaf.club>
Mon, 1 Jun 2020 13:24:03 +0000 (13:24 +0000)
commitfa37bfff99b3d4277a14345cff4ccbbe93385e04
tree36737eb6e5697863cf9aef305c38e61a3b2f5898
parente96765df6b04fe5e9766271a9c62e559392758b2
parentac31f687c0fbe06251257acb72b67146b472d22f
Merge branch 'default-to-hackney-again' into 'develop'

Config: Default to Hackney again

See merge request pleroma/pleroma!2619