Merge branch 'develop' into admin-be

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/web/admin_api/admin_api_controller.ex
index d45b1f7a70e21de3d4ce2cc969ad1ea43c4f3acf,7118faf94b66d77ebdb95013bfff299808064423..d5230f9aa5cbb7d3d2744e25c83444803908c55e
--- 1/lib/pleroma/web/admin_api/admin_api_controller.ex
--- 2/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@@ -94,9 -99,11 +103,9 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
    plug(
      OAuthScopesPlug,
      %{scopes: ["write"], admin: true}
-     when action in [:relay_follow, :relay_unfollow, :config_update]
+     when action == :config_update
    )
  
 -  @users_page_size 50
 -
    action_fallback(:errors)
  
    def user_delete(%{assigns: %{user: admin}} = conn, %{"nickname" => nickname}) do

diff --cc test/web/admin_api/admin_api_controller_test.exs
Simple merge