projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f38c316
9c6abec
)
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Sun, 3 Mar 2019 11:13:59 +0000
(11:13 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Sun, 3 Mar 2019 11:13:59 +0000
(11:13 +0000)
[#675] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/activity_pub_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
test/web/activity_pub/activity_pub_test.exs
Simple merge
projects / akkoma / commitdiff