Merge branch 'develop' into frontend-admin-api

diff --cc CHANGELOG.md
Simple merge

diff --cc config/config.exs
index 4f018d57c565c17d683f57b392667d2751f79f08,0b8a75aad2dcb0c18d552c7f6bf6f239c033f655..1d09a02380f6794670360e277d5d161d5f85e45f
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -563,7 -563,7 +563,9 @@@ config :pleroma, Oban
      remote_fetcher: 2,
      attachments_cleanup: 5,
      new_users_digest: 1,
-     frontend_installer: 1
++    frontend_installer: 1,
+     mute_expire: 5
++    
    ],
    plugins: [Oban.Plugins.Pruner],
    crontab: [

diff --cc lib/pleroma/web/router.ex
Simple merge