From 92ede0a35f231d0366280912351d1008745358d8 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Thu, 25 Jun 2020 19:44:48 +0300
Subject: [PATCH] Update Changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b868f4b6..2309c1bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - On Reports page add links to reported account and the author of the report 
 - In Notes add link to the note author's profile page 
 - In Moderation log add link to the actor's profile page
+- Adds MRF Activity Expiration setting
 
 ### Changed
 
@@ -22,6 +23,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Settings that can't be altered in Admin FE are removed: HTTP Signatures settings, Federation publisher modules and Oban Repo
 - When rendering user's profile, statuses, reports and notes check if required properties exist
 - Remove ability to moderate users that don't have valid nickname
+- Displays both labels and description in the header of group of settiings
+- Ability to add custom values in Pleroma.Upload.Filter.Mogrify setting
 
 ### Fixed
 
-- 
GitLab