Merge branch 'develop' into issue/1383

diff --cc config/config.exs
index bca1f78ace713634e7df53249489bd45e96bfbcb,370ddd855063b801c1ee4c198484a43a0c68f44c..a737c98af40ed30941c184d34d7e696be88636d8
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -51,10 -51,24 +51,10 @@@ config :pleroma, Pleroma.Repo
    telemetry_event: [Pleroma.Repo.Instrumenter],
    migration_lock: nil
  
 -scheduled_jobs =
 -  with digest_config <- Application.get_env(:pleroma, :email_notifications)[:digest],
 -       true <- digest_config[:active] do
 -    [{digest_config[:schedule], {Pleroma.Daemons.DigestEmailDaemon, :perform, []}}]
 -  else
 -    _ -> []
 -  end
 -
 -config :pleroma, Pleroma.Scheduler,
 -  global: true,
 -  overlap: true,
 -  timezone: :utc,
 -  jobs: scheduled_jobs
 -
  config :pleroma, Pleroma.Captcha,
-   enabled: false,
+   enabled: true,
    seconds_valid: 60,
-   method: Pleroma.Captcha.Kocaptcha
+   method: Pleroma.Captcha.Native
  
  config :pleroma, :hackney_pools,
    federation: [

diff --cc config/description.exs
Simple merge

diff --cc config/test.exs
Simple merge

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

diff --cc lib/pleroma/web/mastodon_api/controllers/status_controller.ex
Simple merge

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge