From: lambda <lain@soykaf.club>
Date: Fri, 12 Apr 2019 09:34:12 +0000 (+0000)
Subject: Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0a09692c7decdcaa8c15e5f8eaf10d9e7d16a5e5;p=akkoma

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
---

0a09692c7decdcaa8c15e5f8eaf10d9e7d16a5e5
diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index f3865b2f2,b2fc68707..e0a090659
--- a/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