Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks

# Conflicts:
#	test/web/admin_api/admin_api_controller_test.exs

diff --cc test/web/admin_api/admin_api_controller_test.exs
index ddfb9a5f52de969ad196f264ef70d180a8c5ab81,60db581445586f908971ee28fcb5e945f6390b43..908ef4d37f129b60b9c75f6217066f3e68ee85e5
--- 1/test/web/admin_api/admin_api_controller_test.exs
--- 2/test/web/admin_api/admin_api_controller_test.exs
+++ b/test/web/admin_api/admin_api_controller_test.exs
@@@ -1890,7 -1893,9 +1893,7 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
      end
  
      test "when configuration from database is off", %{conn: conn} do
-       Pleroma.Config.put(:configurable_from_database, false)
 -      initial = Config.get(:configurable_from_database)
+       Config.put(:configurable_from_database, false)
 -      on_exit(fn -> Config.put(:configurable_from_database, initial) end)
        conn = get(conn, "/api/pleroma/admin/config")
  
        assert json_response(conn, 400) ==