Merge branch 'develop' into feature/account-export

diff --cc CHANGELOG.md
Simple merge

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
index 4942e196d27e03eb5403d7a771b500fae13bab45,2a18989224fd12e9c0f87a16d55ba63ea4b81847..88f2a613344be9fbf84aeed146ef6b252dd418f3
--- 1/config/description.exs
--- 2/config/description.exs
+++ b/config/description.exs
@@@ -3713,24 -3709,18 +3715,38 @@@ config :pleroma, :config_description, 
        }
      ]
    },
+   %{
+     group: :pleroma,
+     key: :majic_pool,
+     type: :group,
+     description: "Majic/libmagic configuration",
+     children: [
+       %{
+         key: :size,
+         type: :integer,
+         description: "Number of majic workers to start.",
+         suggestions: [2]
+       }
+     ]
++  },
 +  %{
 +    group: :pleroma,
 +    key: Pleroma.Backup,
 +    type: :group,
 +    description: "Account Backup",
 +    children: [
 +      %{
 +        key: :purge_after_days,
 +        type: :integer,
 +        description: "Remove backup achives after N days",
 +        suggestions: [30]
 +      },
 +      %{
 +        key: :limit_days,
 +        type: :integer,
 +        description: "Limit user to export not more often than once per N days",
 +        suggestions: [7]
 +      }
 +    ]
    }
  ]

diff --cc docs/configuration/cheatsheet.md
Simple merge

diff --cc lib/pleroma/moderation_log.ex
Simple merge

diff --cc lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
index 8b5310d8098959ae7039e8ca98c4f19fb7c4d56f,bdd3e195d177b80b83bc21c92e792bd5c3b6ac14..a4f0d7d348c277eb80334ecda8d5422d58564647
--- 1/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
--- 2/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
@@@ -21,10 -20,9 +20,11 @@@ defmodule Pleroma.Web.AdminAPI.AdminAPI
    alias Pleroma.Web.AdminAPI.ModerationLogView
    alias Pleroma.Web.AdminAPI.Search
    alias Pleroma.Web.Endpoint
+   alias Pleroma.Web.Plugs.OAuthScopesPlug
    alias Pleroma.Web.Router
  
 +  require Logger
 +
    @users_page_size 50
  
    plug(

diff --cc lib/pleroma/web/router.ex
Simple merge

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