Merge branch 'develop' into feature/return-total-for-reports

diff --cc CHANGELOG.md
index 942605f287716cdd2b79ab6ff4463540735dace4,4eb72c002cb128fb6539f43d47e7b36cc832cdfe..584386136f02eb6ab67dd14265d4f9c0c982353e
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,10 -26,12 +26,13 @@@ The format is based on [Keep a Changelo
  - NodeInfo: Return `skipThreadContainment` in `metadata` for the `skip_thread_containment` option
  - NodeInfo: Return `mailerEnabled` in `metadata`
  - Mastodon API: Unsubscribe followers when they unfollow a user
+ - Mastodon API: `pleroma.thread_muted` key in the Status entity
  - AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
  - Improve digest email template
- - Pagination: (optional) return `total` alongside with `items` when paginating
+ – Pagination: (optional) return `total` alongside with `items` when paginating
+ - Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings)
+ - Introduced [quantum](https://github.com/quantum-elixir/quantum-core) job scheduler
 +- Admin API: Return `total` when querying for reports
  
  ### Fixed
  - Following from Osada

diff --cc docs/api/admin_api.md
Simple merge

diff --cc test/web/admin_api/admin_api_controller_test.exs
Simple merge