From: rinpatch <rinpatch@sdf.org>
Date: Thu, 26 Sep 2019 06:11:52 +0000 (+0000)
Subject: Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2b98ef832ca7db7be86667646502c47a43e5d7af;p=akkoma

Merge branch 'backport/1.1-hackney-and-outbox-fixes' into 'maint/1.1'

Backport/1.1 hackney and outbox fixes

See merge request pleroma/pleroma!1718
---

2b98ef832ca7db7be86667646502c47a43e5d7af