summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlambadalambda <gitgud@rogerbraun.net>2017-04-12 11:30:46 -0400
committerlambadalambda <gitgud@rogerbraun.net>2017-04-12 11:30:46 -0400
commitbf22b1547c07df841b152c72d1224e6173c275ed (patch)
treee95bd2c59fc4271bde46227fcbfb85890cb569b6
parent7469616f44ddca66858e6d64040b24b7986a742e (diff)
parent6f99765fbace8081455e57cf2077ba42fd06d338 (diff)
downloadpleroma-bf22b1547c07df841b152c72d1224e6173c275ed.tar.gz
pleroma-bf22b1547c07df841b152c72d1224e6173c275ed.zip
Merge branch 'feature/home-timeline' into 'develop'
Add home timeline See merge request !6
-rw-r--r--lib/pleroma/web/router.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 0d2432b9e..3c560349f 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -33,6 +33,7 @@ defmodule Pleroma.Web.Router do
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