projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6cb31ed
e8cee4d
)
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
author
rinpatch
<rinpatch@sdf.org>
Sun, 8 Dec 2019 11:23:31 +0000
(11:23 +0000)
committer
rinpatch
<rinpatch@sdf.org>
Sun, 8 Dec 2019 11:23:31 +0000
(11:23 +0000)
ActivityPub: For user timelines, respects blocks.
Closes #1463
See merge request pleroma/pleroma!2041
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
projects / akkoma / commitdiff