diff options
| author | kaniini <nenolod@gmail.com> | 2018-11-14 08:52:08 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-11-14 08:52:08 +0000 |
| commit | 69d557e86dd3fd8848a4a06b61c141ff9564954e (patch) | |
| tree | 7ccad56e50ebbbb78d82847b0d0a95c201c7a6fa /lib/pleroma/web/router.ex | |
| parent | a43195bdaa295f624315cba9daad42097de0cfe7 (diff) | |
| parent | ea9a776d7beb32b157269652759b85cdc17fec32 (diff) | |
| download | pleroma-69d557e86dd3fd8848a4a06b61c141ff9564954e.tar.gz | |
Merge branch 'twitter-api-direct-messages' into 'develop'
Twitter api direct messages
See merge request pleroma/pleroma!449
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 2d4302dcd..5e81db00b 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -270,6 +270,7 @@ defmodule Pleroma.Web.Router do get("/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline) get("/statuses/mentions", TwitterAPI.Controller, :mentions_timeline) get("/statuses/mentions_timeline", TwitterAPI.Controller, :mentions_timeline) + get("/statuses/dm_timeline", TwitterAPI.Controller, :dm_timeline) get("/qvitter/statuses/notifications", TwitterAPI.Controller, :notifications) # XXX: this is really a pleroma API, but we want to keep the pleroma namespace clean |