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

This commit is contained in:
lain 2020-12-23 11:40:34 +01:00
commit 5ada38499b

View file

@ -19,9 +19,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Forwarded reports duplication from Pleroma instances. - Forwarded reports duplication from Pleroma instances.
- <details> - <details>
<summary>API</summary> <summary>API</summary>
- Statuses were not displayed for Mastodon forwarded reports. - Statuses were not displayed for Mastodon forwarded reports.
</details> </details>
### Upgrade notes ### Upgrade notes