projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1680a34
e52955c
)
Merge branch 'issue/1348' into 'develop'
author
lain
<lain@soykaf.club>
Thu, 21 Nov 2019 13:13:14 +0000
(13:13 +0000)
committer
lain
<lain@soykaf.club>
Thu, 21 Nov 2019 13:13:14 +0000
(13:13 +0000)
[#1348] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
1
2
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/user_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/user.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge
diff --cc
test/user_test.exs
Simple merge