From: Maksim Pechnikov <parallel588@gmail.com>
Date: Mon, 27 Jan 2020 05:48:19 +0000 (+0300)
Subject: Merge branch 'develop' into issue/1383
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=bfc70fdf29c2e1067179165ef686e6abe20896b0;p=akkoma

Merge branch 'develop' into issue/1383
---

bfc70fdf29c2e1067179165ef686e6abe20896b0
diff --cc config/description.exs
index 3dba9b121,531f5d7e7..7829497fe
--- a/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]
        }
      ]
    },