[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...

# Conflicts:
#	CHANGELOG.md

diff --cc CHANGELOG.md
index c9d6fef17bb412a6f284e5fcc0ffa0a6d31a7953,8264688d6dc83a54c348a2231829d7a4814939f9..cedacbdf6c512f6f66684f1f79a026800291a1db
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,8 -19,7 +19,9 @@@ The format is based on [Keep a Changelo
  - Mastodon API: Unsubscribe followers when they unfollow a user
  - AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
  - Improve digest email template
- - 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).
+ – 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
  
  ### Fixed
  - Following from Osada