diff options
| author | Lain Iwakura <lain@soykaf.club> | 2017-12-19 16:15:45 +0100 |
|---|---|---|
| committer | Lain Iwakura <lain@soykaf.club> | 2017-12-19 16:15:45 +0100 |
| commit | 2a744cdff8a94d92683ab1a16f89bb51112006f8 (patch) | |
| tree | a08e8c27a810972fdc65585bcd08c0a0012d533f /lib/pleroma/web/router.ex | |
| parent | f1f79c0dca9198e2a427f988b60e4222f8afda57 (diff) | |
| parent | 29c981278911e6b4342f63a566cfc308b59176e7 (diff) | |
| download | pleroma-2a744cdff8a94d92683ab1a16f89bb51112006f8.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 6ec5e3097..374b8f251 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -147,6 +147,8 @@ defmodule Pleroma.Web.Router do get "/qvitter/statuses/user_timeline", TwitterAPI.Controller, :user_timeline get "/users/show", TwitterAPI.Controller, :show_user + get "/statuses/followers", TwitterAPI.Controller, :followers + get "/statuses/friends", TwitterAPI.Controller, :friends get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation @@ -193,8 +195,6 @@ defmodule Pleroma.Web.Router do post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar - get "/statuses/followers", TwitterAPI.Controller, :followers - get "/statuses/friends", TwitterAPI.Controller, :friends get "/friends/ids", TwitterAPI.Controller, :friends_ids get "/friendships/no_retweets/ids", TwitterAPI.Controller, :empty_array |