From: Maxim Filippov <colixer@gmail.com>
Date: Sat, 13 Jul 2019 21:39:06 +0000 (+0300)
Subject: Merge branch 'develop' into feature/admin-api-user-statuses
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=418ae6638d64c915ce4dae742dd493f43c8025d8;p=akkoma

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

418ae6638d64c915ce4dae742dd493f43c8025d8
diff --cc CHANGELOG.md
index 86cbaeff7,bebb438b1..149944a02
--- a/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