From: lambadalambda <gitgud@rogerbraun.net>
Date: Wed, 12 Apr 2017 15:30:46 +0000 (-0400)
Subject: Merge branch 'feature/home-timeline' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=bf22b1547c07df841b152c72d1224e6173c275ed;p=akkoma

Merge branch 'feature/home-timeline' into 'develop'

Add home timeline

See merge request !6
---

bf22b1547c07df841b152c72d1224e6173c275ed
diff --cc lib/pleroma/web/router.ex
index 0d2432b9e,66dcbb118..3c560349f
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -30,9 -30,9 +30,10 @@@ defmodule Pleroma.Web.Router d
    scope "/api", Pleroma.Web do
      pipe_through :authenticated_api
  
 +    get "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
      post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials
      post "/statuses/update", TwitterAPI.Controller, :status_update
+     get "/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline
      get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline
      post "/friendships/create", TwitterAPI.Controller, :follow
      post "/friendships/destroy", TwitterAPI.Controller, :unfollow