Merge branch 'develop' into issue/1383

diff --cc config/description.exs
index 3dba9b1218db5f9af9d4714a85a5548c6e9746c9,531f5d7e71f0714107f5dd21c920d57f0d8017df..7829497fef59823a15d90c76fb54de2d8d3b404b
--- 1/config/description.exs
--- 2/config/description.exs
+++ b/config/description.exs
@@@ -2477,7 -2514,14 +2514,7 @@@ config :pleroma, :config_description, 
        %{
          key: :clean_expired_tokens,
          type: :boolean,
-         description: "Enable a background job to clean expired oauth tokens. Defaults to false"
+         description: "Enable a background job to clean expired oauth tokens. Default: `false`."
 -      },
 -      %{
 -        key: :clean_expired_tokens_interval,
 -        type: :integer,
 -        description:
 -          "Interval to run the job to clean expired tokens. Default: 86_400_000 (24 hours).",
 -        suggestions: [86_400_000]
        }
      ]
    },