diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-17 19:45:14 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-17 19:45:14 +0000 |
| commit | 52ac7dce5c460d27d946d26070eb123e89af2914 (patch) | |
| tree | 0f1ac473ae10290bd13220552e2cce8db851f5d4 /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | c6d5f189d9847b0c23d8150f41c05d87402680eb (diff) | |
| parent | de981ac5a23673797951096b64a7f5ca49630467 (diff) | |
| download | pleroma-52ac7dce5c460d27d946d26070eb123e89af2914.tar.gz | |
Merge branch 'captcha' into 'develop'
Captcha
See merge request pleroma/pleroma!550
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 2f2b69623..38653f0b8 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -284,4 +284,8 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do json(conn, %{error: msg}) end end + + def captcha(conn, _params) do + json(conn, Pleroma.Captcha.new()) + end end |