From: Maxim Filippov <colixer@gmail.com>
Date: Mon, 9 Sep 2019 22:23:20 +0000 (+0300)
Subject: Merge branch 'develop' into feature/moderation-log-filters
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d1abf7a3585e4bc1ebea4f615ae2e149d5a56918;p=akkoma

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

d1abf7a3585e4bc1ebea4f615ae2e149d5a56918
diff --cc CHANGELOG.md
index 0a959c73b,a3fa9dfb6..84347a56a
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -100,7 -109,7 +109,8 @@@ The format is based on [Keep a Changelo
  - Mix Tasks: `mix pleroma.database fix_likes_collections`
  - Federation: Remove `likes` from objects.
  - Admin API: Added moderation log
+ - Web response cache (currently, enabled for ActivityPub)
 +- 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