From: lain <lain@soykaf.club>
Date: Wed, 23 Dec 2020 10:40:34 +0000 (+0100)
Subject: Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5ada38499b8f906306796b9771361571fdf03073;p=akkoma

Merge branch 'release/2.2.1' of git.pleroma.social:pleroma/pleroma into release/2.2.1
---

5ada38499b8f906306796b9771361571fdf03073
diff --cc CHANGELOG.md
index 35e245d1b,f8d947578..f32014f1c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -19,14 -19,10 +19,14 @@@ The format is based on [Keep a Changelo
  - Forwarded reports duplication from Pleroma instances.
  
  - <details>
-   <summary>API</summary>
- - Statuses were not displayed for Mastodon forwarded reports.
- </details>
+     <summary>API</summary>
+   - Statuses were not displayed for Mastodon forwarded reports.
+   </details>
  
 +### Upgrade notes
 +
 +1. Restart Pleroma
 +
  
  ## [2.2.0] - 2020-11-12