Merge branch 'develop' into global-status-expiration

[akkoma] / CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8eed9cf7de7f219a1d1f2564c286973194f9b93a..475fc5d89a72d515fcfbf7b6224ae27e9ee507f4 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [unreleased]
+
 ### Removed
 - **Breaking:** removed `with_move` parameter from notifications timeline.
 
@@ -18,7 +19,11 @@ 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
+### Changed
+- MFR policy to set global expiration for all local Create activities
+
+
+## [2.0.2] - 2020-04-08
 ### Added
 - Support for Funkwhale's `Audio` activity
 - Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
@@ -30,6 +35,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - `user delete_activities` breaking when trying to delete already deleted posts
 - Incorrect URL for Funkwhale channels
 
+### Upgrade notes
+1. Restart Pleroma
+
 ## [2.0.1] - 2020-03-15
 ### Security
 - Static-FE: Fix remote posts not being sanitized