Merge branch 'develop' into feature/moderation-log-filters

diff --cc CHANGELOG.md
index 84347a56a96e0fbdc5da6b6f35f47e3128cedfb3,4eb72c002cb128fb6539f43d47e7b36cc832cdfe..1766b9e4cf26fd1b05be7437a78d8820f6634af4
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -110,7 -115,7 +115,8 @@@ The format is based on [Keep a Changelo
  - Federation: Remove `likes` from objects.
  - Admin API: Added moderation log
  - Web response cache (currently, enabled for ActivityPub)
+ - Mastodon API: Added an endpoint to get multiple statuses by IDs (`GET /api/v1/statuses/?ids[]=1&ids[]=2`)
 +- Admin API: Added moderation log filters (user/start date/end date/search/pagination)
  
  ### Changed
  - Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text

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

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