Merge branch 'fix/streamer-timeout' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 11 May 2020 17:07:55 +0000 (17:07 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 11 May 2020 17:07:55 +0000 (17:07 +0000)
Fix streamer timeout

Closes #1735 and #1753

See merge request pleroma/pleroma!2509


Trivial merge