Merge branch 'fix-streaming-reblog' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 29 Jan 2020 20:21:32 +0000 (20:21 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Wed, 29 Jan 2020 20:21:32 +0000 (20:21 +0000)
commit946de2299cccebac6718e3a132397ff5c06c67ee
treea23419a5bc866fab716c8e32c2c52a70620f6745
parent505234d9759555a17a6dd436bb31307967ab660b
parent7a60cd91ff6d28e6261a49e43b6fd048e755cf46
Merge branch 'fix-streaming-reblog' into 'develop'

Streamer: Correctly handle reblog mutes

Closes #1129 and #1438

See merge request pleroma/pleroma!2156