From: Sachin Joshi <satchin.joshi@gmail.com>
Date: Thu, 23 May 2019 07:45:12 +0000 (+0200)
Subject: fix merge conflict
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0c53d91f3bfe7bbd8d8b9ffd332ac2f57b6aba34;p=akkoma

fix merge conflict
---

0c53d91f3bfe7bbd8d8b9ffd332ac2f57b6aba34
diff --cc CHANGELOG.md
index d4a74d30c,7869e299b..feacf2c5e
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -38,7 -41,10 +41,11 @@@ The format is based on [Keep a Changelo
  - Metadata: RelMe provider
  - OAuth: added support for refresh tokens
  - Emoji packs and emoji pack manager
+ - Object pruning (`mix pleroma.database prune_objects`)
+ - OAuth: added job to clean expired access tokens
+ - MRF: Support for rejecting reports from specific instances (`mrf_simple`)
+ - MRF: Support for stripping avatars and banner images from specific instances (`mrf_simple`)
 +- Ability to reset avatar, profile banner and backgroud
  
  ### Changed
  - **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer