Merge branch 'fix/develop' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 16 Sep 2019 10:59:44 +0000 (10:59 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 16 Sep 2019 10:59:44 +0000 (10:59 +0000)
commit409e701ab849475c81073d80a973487d67cadaae
tree7d14925ffdc67390377efd5ece22304e71ced360
parent4397a3fe4ac932a055901622b3c30a319997df6c
parent96816ceaa25c21cec7677e75dcddd7ffb42d83c3
Merge branch 'fix/develop' into 'develop'

Add "Streamer refactoring" back to `develop`

See merge request pleroma/pleroma!1675