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

diff --cc CHANGELOG.md
index 35e245d1b8a0d821f9d7f90f73b64e6a72044136,f8d94757894895518576a39a6488792c98d09231..f32014f1c2459a7fd3b48546b583fc56570fed1b
--- 1/CHANGELOG.md
--- 2/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