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)
commit768c18facb28b3ebff5719e70e6d094c3b29c871
tree8c68d32bf43b9baaaa0909cc4c2cc337a6c846c5
parente4323141056afc47c2bef7352aaca90edc467a64
parente2b15e8ad31f637cbbc53b3bbc2db0972800fc88
Merge branch 'fix/streamer-timeout' into 'develop'

Fix streamer timeout

Closes #1735 and #1753

See merge request pleroma/pleroma!2509