aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-08-08 16:04:20 +0200
committerlain <lain@soykaf.club>2019-08-08 16:04:20 +0200
commita2b98f6d58218c5806247743aa0a2a600c9959ab (patch)
tree49914ac1e30561e1180651ad6b0fef5d96ecfb5c /lib/pleroma/web/router.ex
parente4a01d253ef7ab09d028198e5e39b9aba357486c (diff)
parentb18234e04c76daa564e0d8157dcd09566485da24 (diff)
downloadpleroma-a2b98f6d58218c5806247743aa0a2a600c9959ab.tar.gz
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r--lib/pleroma/web/router.ex2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 6cdef7e2f..c835f06b4 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -196,6 +196,8 @@ 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/migrate_from_db", AdminAPIController, :migrate_from_db)
end
scope "/", Pleroma.Web.TwitterAPI do