Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api

diff --combined CHANGELOG.md
index a80a602dfdf5c934cb9247a14014317d58335260,2ee17d239dde32fbb707d3bc3dd47c4fc32d57af..295b7c31cd3e5467b23acf885e20c868a71122a1
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -11,7 -11,6 +11,7 @@@ The format is based on [Keep a Changelo
  - Mix task option for force-unfollowing relays
  - Media preview proxy (requires `ffmpeg` and `ImageMagick` to be installed and media proxy to be enabled; see `:media_preview_proxy` config for more details).
  - Pleroma API: Importing the mutes users from CSV files.
 +- Pleroma API: An endpoint to manage frontends
  - Experimental websocket-based federation between Pleroma instances.
  - Support pagination of blocks and mutes
  - App metrics: ability to restrict access to specified IP whitelist.
@@@ -59,6 -58,8 +59,8 @@@ switched to a new configuration mechani
  - Allow sending chat messages to yourself.
  - Fix remote users with a whitespace name.
  - OStatus / static FE endpoints: fixed inaccessibility for anonymous users on non-federating instances, switched to handling per `:restrict_unauthenticated` setting.
+ - Mastodon API: Current user is now included in conversation if it's the only participant
+ - Mastodon API: Fixed last_status.account being not filled with account data
  
  ## Unreleased (Patch)