projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dfdbb6f
8a1e0c9
)
Merge branch 'count-only-public-statuses' into 'develop'
author
kaniini
<nenolod@gmail.com>
Sun, 3 Mar 2019 15:49:19 +0000
(15:49 +0000)
committer
kaniini
<nenolod@gmail.com>
Sun, 3 Mar 2019 15:49:19 +0000
(15:49 +0000)
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
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