Merge branch 'deactivate-gun-again' into 'develop'
authorlain <lain@soykaf.club>
Fri, 31 Jul 2020 09:11:24 +0000 (09:11 +0000)
committerlain <lain@soykaf.club>
Fri, 31 Jul 2020 09:11:24 +0000 (09:11 +0000)
commita1a43f39dc85e673f6e4f395b7ac515356177fdf
tree4c387e350e638be03fe9c387858bb1fd825082fc
parentac0a8dfdd46b1823cace7fb798d669e8ca7b5dac
parent7bcd2e948ea5cc59ad0a40e2840be86650f0995e
Merge branch 'deactivate-gun-again' into 'develop'

Config: Default to Hackney again

See merge request pleroma/pleroma!2821