Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 21 Oct 2019 16:44:17 +0000 (16:44 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 21 Oct 2019 16:44:17 +0000 (16:44 +0000)
commit6712b6e4de304eac09955689bcefbbe21d7fc1a5
tree19e27df441249bb4bdcc3ab4c32af70058ef988a
parentce750dbab5de905af1e0ba6ba6a5a08b41600ac1
parent2dbee29cf5a1a17438e8bc3d2586717da64e20ff
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'

Do not include notifications from blocked users when with_muted is set

See merge request pleroma/pleroma!1869