From: lain <lain@soykaf.club>
Date: Fri, 31 Jul 2020 09:11:24 +0000 (+0000)
Subject: Merge branch 'deactivate-gun-again' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a1a43f39dc85e673f6e4f395b7ac515356177fdf;p=akkoma

Merge branch 'deactivate-gun-again' into 'develop'

Config: Default to Hackney again

See merge request pleroma/pleroma!2821
---

a1a43f39dc85e673f6e4f395b7ac515356177fdf