diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-07-29 13:01:16 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-07-29 13:01:16 -0500 |
| commit | 702f0fb822d40f0e004df1cdf3d9c2079ddc98e5 (patch) | |
| tree | 0dd822004be00402b84a9537506b9de3fd0bf5b6 /lib/pleroma/web/router.ex | |
| parent | 93638935d783c092dabac51982426ebd98a21e0e (diff) | |
| parent | a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff) | |
| download | pleroma-702f0fb822d40f0e004df1cdf3d9c2079ddc98e5.tar.gz | |
Merge remote-tracking branch 'upstream/develop' into mrf-silence
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 386308362..c6433cc53 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -138,6 +138,7 @@ defmodule Pleroma.Web.Router do patch("/users/:nickname/toggle_activation", AdminAPIController, :user_toggle_activation) patch("/users/activate", AdminAPIController, :user_activate) patch("/users/deactivate", AdminAPIController, :user_deactivate) + patch("/users/approve", AdminAPIController, :user_approve) put("/users/tag", AdminAPIController, :tag_users) delete("/users/tag", AdminAPIController, :untag_users) |