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

[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

Browse source 
# Conflicts:
#	mix.exs
This commit is contained in:
Ivan Tashkinov 2019-04-02 13:50:12 +03:00
commit 590c935d95
9 changed files with 95 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/pleroma/web/router.ex
View file

@ -233,6 +233,7 @@ defmodule Pleroma.Web.Router do
get("/accounts/search", MastodonAPIController, :account_search)
get("/accounts/:id/lists", MastodonAPIController, :account_lists)
get("/accounts/:id/identity_proofs", MastodonAPIController, :empty_array)
get("/follow_requests", MastodonAPIController, :follow_requests)
get("/blocks", MastodonAPIController, :blocks)