Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sun, 8 Dec 2019 11:23:31 +0000 (11:23 +0000)
committerrinpatch <rinpatch@sdf.org>
Sun, 8 Dec 2019 11:23:31 +0000 (11:23 +0000)
commit29a3f70cba7bed31e6777832c4d2dc5c326b70c1
tree08882be8111f79012af716f6d5fa78feccb187cb
parent6cb31edd76fd42a0e33bc365d982cd02e3578d6c
parente8cee4d9a0ea13db8d087e42eb17939bb8b11f0b
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'

ActivityPub: For user timelines, respects blocks.

Closes #1463

See merge request pleroma/pleroma!2041
lib/pleroma/web/activity_pub/activity_pub.ex