aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-17 19:45:14 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-17 19:45:14 +0000
commit52ac7dce5c460d27d946d26070eb123e89af2914 (patch)
tree0f1ac473ae10290bd13220552e2cce8db851f5d4 /lib/pleroma/web/router.ex
parentc6d5f189d9847b0c23d8150f41c05d87402680eb (diff)
parentde981ac5a23673797951096b64a7f5ca49630467 (diff)
downloadpleroma-52ac7dce5c460d27d946d26070eb123e89af2914.tar.gz
Merge branch 'captcha' into 'develop'
Captcha See merge request pleroma/pleroma!550
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 daff3362c..60342cfb4 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -99,6 +99,7 @@ defmodule Pleroma.Web.Router do
get("/password_reset/:token", UtilController, :show_password_reset)
post("/password_reset", UtilController, :password_reset)
get("/emoji", UtilController, :emoji)
+ get("/captcha", UtilController, :captcha)
end
scope "/api/pleroma/admin", Pleroma.Web.AdminAPI do