projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3f38a05
ecdf065
)
Merge branch 'follow-request-count' into 'develop'
author
kaniini
<nenolod@gmail.com>
Mon, 18 Feb 2019 04:01:26 +0000
(
04:01
+0000)
committer
kaniini
<nenolod@gmail.com>
Mon, 18 Feb 2019 04:01:26 +0000
(
04:01
+0000)
Follow request count
See merge request pleroma/pleroma!817
1
2
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/twitter_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/twitter_api/twitter_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/user.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge
diff --cc
test/web/twitter_api/twitter_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff