Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire...

diff --cc CHANGELOG.md
index 770bd13f06090e01d9d951c7de5c3ac7622c1d43,3a82f7d6c59d2dd858b86a14cb8c9bb765788836..f0b90ff40c31a425df336b1bb906aa24043b4050
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -12,13 -30,21 +30,22 @@@ The format is based on [Keep a Changelo
  - The `discoverable` field in the `User` struct will now add a NOINDEX metatag to profile pages when false.
  - Users with the `discoverable` field set to false will not show up in searches.
  - Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
+ - Introduced optional dependencies on `ffmpeg`, `ImageMagick`, `exiftool` software packages. Please refer to `docs/installation/optional/media_graphics_packages.md`.
+ - Polls now always return a `voters_count`, even if they are single-choice
+ 
+ <details>
+   <summary>API Changes</summary>
  
- ### Added
- - Media preview proxy (requires media proxy be enabled; see `:media_preview_proxy` config for more details).
  - Pleroma API: Importing the mutes users from CSV files.
- - Experimental websocket-based federation between Pleroma instances.
  - Admin API: Importing emoji from a zip file
- - User and conversation mutes can now auto-expire if `expires_in` parameter was given while adding the mute.
+ - Pleroma API: Pagination for remote/local packs and emoji.
+ - Admin API: (`GET /api/pleroma/admin/users`) added filters user by `unconfirmed` status
+ - Admin API: (`GET /api/pleroma/admin/users`) added filters user by `actor_type`
+ - Pleroma API: Add `idempotency_key` to the chat message entity that can be used for optimistic message sending.
+ - Pleroma API: (`GET /api/v1/pleroma/federation_status`) Add a way to get a list of unreachable instances.
++- Mastodon API: User and conversation mutes can now auto-expire if `expires_in` parameter was given while adding the mute.
+ 
+ </details>
  
  ### Removed
  

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/api_spec/operations/account_operation.ex
Simple merge

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

diff --cc lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/controllers/status_controller.ex
Simple merge

diff --cc test/pleroma/notification_test.exs
Simple merge

diff --cc test/pleroma/user_test.exs
Simple merge

diff --cc test/pleroma/web/common_api_test.exs
Simple merge

diff --cc test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs
Simple merge

diff --cc test/pleroma/web/mastodon_api/views/account_view_test.exs
Simple merge