projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4aa285e
984b5f8
)
Merge branch 'masto-api-followers-following' into 'develop'
author
kaniini
<nenolod@gmail.com>
Tue, 12 Mar 2019 16:27:47 +0000
(16:27 +0000)
committer
kaniini
<nenolod@gmail.com>
Tue, 12 Mar 2019 16:27:47 +0000
(16:27 +0000)
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
1
2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/mastodon_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc
test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge