Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation

diff --cc CHANGELOG.md
Simple merge

diff --cc config/config.exs
index 242355035bac1d49cdd3e69322e32c2231ae4583,ccc0c4e525b99b79a08a2c64e8fd6761ac8ff59f..cb1551c2ad8347b4c7bb79fa413ff8ba895c1bba
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -495,8 -480,13 +481,14 @@@ config :pleroma, Oban
      transmogrifier: 20,
      scheduled_activities: 10,
      background: 5,
 +    remote_fetcher: 2,
      attachments_cleanup: 5
+   ],
+   crontab: [
+     {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
+     {"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
+     {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker},
+     {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker}
    ]
  
  config :pleroma, :workers,

diff --cc config/description.exs
Simple merge