Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'
authorrinpatch <rinpatch@sdf.org>
Thu, 26 Sep 2019 06:11:52 +0000 (06:11 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 26 Sep 2019 06:11:52 +0000 (06:11 +0000)
Backport/1.1 hackney and outbox fixes

See merge request pleroma/pleroma!1718


Trivial merge