Merge branch 'develop' into feature/moderation-log-filters
authorMaxim Filippov <colixer@gmail.com>
Mon, 9 Sep 2019 22:23:20 +0000 (01:23 +0300)
committerMaxim Filippov <colixer@gmail.com>
Mon, 9 Sep 2019 22:23:20 +0000 (01:23 +0300)
1  2 
CHANGELOG.md

diff --cc CHANGELOG.md
index 0a959c73bbf842ddfe2e8723fb1a84d41f949f1e,a3fa9dfb67600a9699a2fa63abf31055df0cda30..84347a56a96e0fbdc5da6b6f35f47e3128cedfb3
@@@ -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