Merge branch 'fix-feed-pagination' into 'develop'

Fix for feed page pagination

Closes #1605

See merge request pleroma/pleroma!2281

diff --cc test/web/feed/tag_controller_test.exs
index 1ec39ec5da1155d6afa366b08157eaf87505b799,da1caf049559204c2a2ea14bc93cc61ff2555821..e863df86b0c7fa987a02149b98e5c99f40586696
--- 1/test/web/feed/tag_controller_test.exs
--- 2/test/web/feed/tag_controller_test.exs
+++ b/test/web/feed/tag_controller_test.exs
@@@ -8,9 -8,11 +8,11 @@@ defmodule Pleroma.Web.Feed.TagControlle
    import Pleroma.Factory
    import SweetXml
  
+   alias Pleroma.Object
+   alias Pleroma.Web.CommonAPI
    alias Pleroma.Web.Feed.FeedView
  
 -  clear_config([:feed])
 +  setup do: clear_config([:feed])
  
    test "gets a feed (ATOM)", %{conn: conn} do
      Pleroma.Config.put(

diff --cc test/web/feed/user_controller_test.exs
Simple merge