From: rinpatch <rinpatch@sdf.org>
Date: Mon, 11 May 2020 17:07:55 +0000 (+0000)
Subject: Merge branch 'fix/streamer-timeout' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=768c18facb28b3ebff5719e70e6d094c3b29c871;p=akkoma

Merge branch 'fix/streamer-timeout' into 'develop'

Fix streamer timeout

Closes #1735 and #1753

See merge request pleroma/pleroma!2509
---

768c18facb28b3ebff5719e70e6d094c3b29c871