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

# Conflicts:
#	config/config.exs

diff --cc CHANGELOG.md
index bdd6ec432382832d0863be8a4d143b8c3a7944cd,ce0f584cba9342aa223d2ae7aaf0a8c2e1d6965c..e0ab69d8b2a2a3f1289e09a50180338d2ea16349
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -72,8 -72,8 +72,9 @@@ The format is based on [Keep a Changelo
  - User notification settings: Add `privacy_option` option.
  - Support for custom Elixir modules (such as MRF policies)
  - User settings: Add _This account is a_ option.
+ - A new users admin digest email
  - OAuth: admin scopes support (relevant setting: `[:auth, :enforce_oauth_admin_scope_usage]`).
 +- ActivityPub: support for `replies` collection (output for outgoing federation & fetching on incoming federation).
  <details>
    <summary>API Changes</summary>
  

diff --cc config/config.exs
index cb1551c2ad8347b4c7bb79fa413ff8ba895c1bba,664572cf31bc65460666ed889a4aeb9642ad411c..47b53d5aff7353eb4396938f8f8cb55264dc8c99
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -481,8 -480,8 +481,9 @@@ config :pleroma, Oban
      transmogrifier: 20,
      scheduled_activities: 10,
      background: 5,
 -    attachments_cleanup: 5,
 +    remote_fetcher: 2,
 +    attachments_cleanup: 5
+     new_users_digest: 1
    ],
    crontab: [
      {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},

diff --cc config/description.exs
Simple merge