aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-01-23 11:42:10 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-01-23 11:42:10 +0300
commit2cfe1b93854c117fda19e54ea17c99f72413a569 (patch)
tree1ae8ca344d7f970db4f6f6cb9283d3cf21d1756a /lib/pleroma/web/router.ex
parent5ea859644897354dfea47655ce39dda46439040a (diff)
parentdddebee047efc4ab1dff6565bef32954695846a7 (diff)
downloadpleroma-2cfe1b93854c117fda19e54ea17c99f72413a569.tar.gz
Merge branch 'develop' into feature/tag_feed
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r--lib/pleroma/web/router.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 787d300fb..b5c1d85c7 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -195,7 +195,7 @@ defmodule Pleroma.Web.Router do
get("/config", AdminAPIController, :config_show)
post("/config", AdminAPIController, :config_update)
- get("/config/migrate_to_db", AdminAPIController, :migrate_to_db)
+ get("/config/descriptions", AdminAPIController, :config_descriptions)
get("/config/migrate_from_db", AdminAPIController, :migrate_from_db)
get("/moderation_log", AdminAPIController, :list_log)