aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2021-02-04 12:37:20 -0600
committerMark Felder <feld@feld.me>2021-02-04 12:37:20 -0600
commitd04737229196a08db4bc726f8afd55a64dcf8304 (patch)
tree8930f46364a986b8252a75428d97016c4b4e093c /lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
parent000d3365c391fb3613c5365f73f5bd51d2555840 (diff)
parentd7262f7d2232343e47c2206b134a7d794e35c505 (diff)
downloadpleroma-d04737229196a08db4bc726f8afd55a64dcf8304.tar.gz
Merge branch 'develop' into fix/reports-from-admins
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers/admin_api_controller.ex')
-rw-r--r--lib/pleroma/web/admin_api/controllers/admin_api_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index 8f89f066a..d581df4a2 100644
--- a/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@ -406,7 +406,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
if Config.get(:configurable_from_database) do
:ok
else
- {:error, "To use this endpoint you need to enable configuration from database."}
+ {:error, "You must enable configurable_from_database in your config file."}
end
end