Merge branch 'features/apc2s-pagination' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 5 Jun 2020 14:52:09 +0000 (14:52 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Fri, 5 Jun 2020 14:52:09 +0000 (14:52 +0000)
commitd74985af2381b1c0dae2bc9c79c14582e5c61b97
tree56116977aaeed3c5efb43888984c514645909030
parent657e1583f8af1ecdf218ba283de4234233bfe5fd
parenta43b435c0ad8a1198241fbd18e1a5f1be830f4b5
Merge branch 'features/apc2s-pagination' into 'develop'

Fix AP C2S pagination

Closes #866 and #751

See merge request pleroma/pleroma!2491
lib/pleroma/web/controller_helper.ex
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
lib/pleroma/web/router.ex