Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists

diff --cc CHANGELOG.md
index 2fadb5f184f32e997e289c9c34bdf21a823968db,c563c39da2512ffe0eb07d7686c84c6098661e38..d7536d67fcbbae42249f26be69984b3a14dfb726
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -26,13 -27,11 +27,12 @@@ The format is based on [Keep a Changelo
  - Mastodon API: `/api/v1/notifications/destroy_multiple` (glitch-soc extension)
  - Mastodon API: `/api/v1/pleroma/accounts/:id/favourites` (API extension)
  - Mastodon API: [Reports](https://docs.joinmastodon.org/api/rest/reports/)
- - Mastodon API: REST API for creating an account
+ - Mastodon API: `POST /api/v1/accounts` (account creation API)
  - ActivityPub C2S: OAuth endpoints
- - Metadata RelMe provider
+ - Metadata: RelMe provider
  - OAuth: added support for refresh tokens
  - Emoji packs and emoji pack manager
- - AdminFE: initial release with basic user management accessible at /pleroma/admin/
 +- Addressable lists
  
  ### Changed
  - **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer

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