Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'

Features: mastoapi-2.6.0 `min_id` pagination

Closes #351

See merge request pleroma/pleroma!976

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index f3865b2f2c2eb362752e1b00b2ae3d92b5bc143e,b2fc68707e7f3dd73a8ecae23064995bc91f03fc..e0a090659ee26e484b6fb487523fad97c641b9a0
--- 1/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
--- 2/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@@ -11,8 -10,8 +11,9 @@@ defmodule Pleroma.Web.MastodonAPI.Masto
    alias Pleroma.Filter
    alias Pleroma.Notification
    alias Pleroma.Object
+   alias Pleroma.Pagination
    alias Pleroma.Repo
 +  alias Pleroma.ScheduledActivity
    alias Pleroma.Stats
    alias Pleroma.User
    alias Pleroma.Web

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge