Merge branch 'develop' into issue/1383

diff --cc config/config.exs
index 8b8ecc833f71492c058d02ef9e605bdcd2fdf752,9be1c721f2f1cc5a35fc563b627b2410338400c4..d706adc6e9c024f9b10a28a75afae58be9c4cad4
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -488,13 -502,8 +488,14 @@@ config :pleroma, Oban
      mailer: 10,
      transmogrifier: 20,
      scheduled_activities: 10,
-     background: 5
+     background: 5,
+     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 lib/pleroma/application.ex
Simple merge

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge