Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth...

[akkoma] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6942ad0bf91c3194796542f6d7f0117d6417dbea..56b235f6dccc1878b101087b61120b63d946aba9 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,15 +18,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Mastodon API: Added `/api/v1/notifications/:id/dismiss` endpoint.
 </details>
 
-## [2.0.2] - 2020-03-31
+### Fixed
+- Support pagination in conversations API
+
+## [unreleased-patch]
+### Fixed
+- Logger configuration through AdminFE
+
+## [2.0.2] - 2020-04-08
+### Added
+- Support for Funkwhale's `Audio` activity
+- Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
+
 ### Fixed
 - Blocked/muted users still generating push notifications
 - Input textbox for bio ignoring newlines
 - OTP: Inability to use PostgreSQL databases with SSL
 - `user delete_activities` breaking when trying to delete already deleted posts
+- Incorrect URL for Funkwhale channels
 
-### Added
-- Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
+### Upgrade notes
+1. Restart Pleroma
 
 ## [2.0.1] - 2020-03-15
 ### Security
@@ -57,7 +69,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [2.0.0] - 2019-03-08
 ### Security
-- Mastodon API: Fix being able to request enourmous amount of statuses in timelines leading to DoS. Now limited to 40 per request.
+- Mastodon API: Fix being able to request enormous amount of statuses in timelines leading to DoS. Now limited to 40 per request.
 
 ### Removed
 - **Breaking**: Removed 1.0+ deprecated configurations `Pleroma.Upload, :strip_exif` and `:instance, :dedupe_media`