aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-01-22 20:20:39 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-01-22 20:20:39 +0300
commitcf19bf3c7c82eb64f10cee309484d9591b1a3cae (patch)
tree77cd904cd7d397eb2ac72561a8cd5dcdd0609044 /lib/pleroma/web/router.ex
parente761d76e4fe95a8fadd8eb05d5c55ef5fc4bc8ec (diff)
parentbe2777715650d0ac80509f0bd22b4cea8641f9b3 (diff)
downloadpleroma-cf19bf3c7c82eb64f10cee309484d9591b1a3cae.tar.gz
Merge branch 'develop' into issue/1383
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 9654ab8a3..ef6e5a565 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)