Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sun, 18 Aug 2019 21:57:55 +0000 (21:57 +0000)
committerkaniini <ariadne@dereferenced.org>
Sun, 18 Aug 2019 21:57:55 +0000 (21:57 +0000)
commit18c8c8d1761e49b442ceef425f5de44166266d4e
tree3345b0cdc554116f6575673b794f46ae8f65396b
parent7ab2dbbdb60e08a6b142e62b2f50561427715bd4
parenta4a3e3becd5e008dbfa9a23157ae4b16a0652bce
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'

Hide muted theads from home/public timelines unless `with_muted` is set

See merge request pleroma/pleroma!1575
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/streamer.ex