diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-14 16:26:56 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-14 21:29:14 +0300 |
| commit | c9f45edeac2cc3ed262bb4b30dc7e1120c6fa047 (patch) | |
| tree | 3ba35681409d9c5dd9ca4d355ff39d4dd67448d4 /lib/pleroma/web/router.ex | |
| parent | 969769730e0b7578ddc6a5cd02f9b24eff5902a0 (diff) | |
| parent | 12b28c8925c2c55e0d7bb66ff3320532a1aade3b (diff) | |
| download | pleroma-c9f45edeac2cc3ed262bb4b30dc7e1120c6fa047.tar.gz | |
Merge branch 'develop' into feature/tag_feed
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 b32cd7c90..787d300fb 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -229,9 +229,9 @@ defmodule Pleroma.Web.Router do pipe_through(:pleroma_html) post("/main/ostatus", UtilController, :remote_subscribe) - get("/ostatus_subscribe", UtilController, :remote_follow) + get("/ostatus_subscribe", RemoteFollowController, :follow) - post("/ostatus_subscribe", UtilController, :do_remote_follow) + post("/ostatus_subscribe", RemoteFollowController, :do_follow) end scope "/api/pleroma", Pleroma.Web.TwitterAPI do |