diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-04-19 05:50:24 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-04-19 05:50:24 -0400 |
| commit | eda742c78b0087033ee96f27c13dbdc00741cf87 (patch) | |
| tree | 3d81f27ec6da307a01c5e912dc939bbda95dbafe /lib/pleroma/web/router.ex | |
| parent | ac9817bdb0d911cffe1678bdf63de9e527a47b48 (diff) | |
| parent | 470f5f7cd616852327706bae74bd1eddd653285f (diff) | |
| download | pleroma-eda742c78b0087033ee96f27c13dbdc00741cf87.tar.gz | |
Merge branch 'feature/user-timeline' into 'develop'
Feature/user timeline
See merge request !8
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 0446f622b..b28813a45 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -25,6 +25,7 @@ defmodule Pleroma.Web.Router do get "/help/test", TwitterAPI.Controller, :help_test get "/statuses/public_timeline", TwitterAPI.Controller, :public_timeline get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_timeline + get "/statuses/user_timeline", TwitterAPI.Controller, :user_timeline get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation get "/statusnet/config", TwitterAPI.Controller, :config |