aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-02-02 07:33:09 +0000
committerlambda <pleromagit@rogerbraun.net>2018-02-02 07:33:09 +0000
commit3163311098ddaa0ca8b40be3fedfcf7631119ad5 (patch)
tree88d5701dd9f4645ef2167d5733579313eaf21e25 /lib/pleroma/web/router.ex
parentab83e0de6d389428cec11fe94280d675a38f00d0 (diff)
parent29be70c0082ea09f03896c7e52e2b8a9cdbea641 (diff)
downloadpleroma-3163311098ddaa0ca8b40be3fedfcf7631119ad5.tar.gz
Merge branch 'feature/remote-follow' into 'develop'
Add remote following of local profiles. See merge request pleroma/pleroma!59
Diffstat (limited to 'lib/pleroma/web/router.ex')
-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 63dbd6245..6e9f40955 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -62,6 +62,7 @@ defmodule Pleroma.Web.Router do
pipe_through :pleroma_html
get "/ostatus_subscribe", UtilController, :remote_follow
post "/ostatus_subscribe", UtilController, :do_remote_follow
+ post "/main/ostatus", UtilController, :remote_subscribe
end
scope "/api/pleroma", Pleroma.Web.TwitterAPI do