hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats

Browse source
This commit is contained in:
Francis Dinh 2018-04-25 00:46:28 -04:00
commit 9e0dd21ed6
33 changed files with 242 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -528,7 +528,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
^query
),
limit: 20,
order_by: [desc: :inserted_at]
order_by: [desc: :id]
)
statuses = Repo.all(q) ++ fetched