Merge branch 'develop' into feature/admin-api-user-statuses

diff --cc CHANGELOG.md
index 86cbaeff7160acf1a69fe0e35b9c3b529edf1e6e,bebb438b1927414271f7fdacce3cd1cc93e9ca75..149944a02f6d21e9ee997cce8a3fc027d59c8d3f
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -30,7 -34,7 +34,8 @@@ The format is based on [Keep a Changelo
  - Added synchronization of following/followers counters for external users
  - Configuration: `enabled` option for `Pleroma.Emails.Mailer`, defaulting to `false`.
  - Mastodon API: Add support for categories for custom emojis by reusing the group feature. <https://github.com/tootsuite/mastodon/pull/11196>
+ - Configuration: Pleroma.Plugs.RateLimiter `bucket_name`, `params` options.
 +- Admin API: Endpoint for fetching latest user's statuses
  
  ### Changed
  - Configuration: Filter.AnonymizeFilename added ability to retain file extension with custom text

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