projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
657e158
a43b435
)
Merge branch 'features/apc2s-pagination' into 'develop'
author
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Fri, 5 Jun 2020 14:52:09 +0000
(14:52 +0000)
committer
Haelwenn
<contact+git.pleroma.social@hacktivis.me>
Fri, 5 Jun 2020 14:52:09 +0000
(14:52 +0000)
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
1
2
lib/pleroma/web/controller_helper.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/controller_helper.ex
Simple merge
diff --cc
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
projects / akkoma / commitdiff