From f49736d2b0416fa6882f37a4f17533f261bf8824 Mon Sep 17 00:00:00 2001
From: Norm <normandy@biribiri.dev>
Date: Sun, 7 Aug 2022 11:51:35 +0000
Subject: [PATCH] Update 'CHANGELOG.md'

Add in changes that were made since FoundKey diverged from upstream
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5caa96b51..84c4bfa72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ You should also include the user name that made the change.
 - ハイライトがみつけるに統合されました
 - カスタム絵文字ページはインスタンス情報ページに統合されました
 - 連合ページはインスタンス情報ページに統合されました
+- Remove ads @Johann150
+- Simplify ID generation: Only the `aid` generation algorithm will be supported going forward. @Johann150
 
 ### Improvements
 - Client: Fix URL-encoded routing
@@ -32,6 +34,10 @@ You should also include the user name that made the change.
 - Server: Improve performance
 - Server: Supports IPv6 on Redis transport. @mei23  
   IPv4/IPv6 is used by default. You can tune this behavior via `redis.family`.
+- Backend: Improve mutes and blocks @toast
+- Hide metadata of private notes @Johann150
+- Add padding to pages @norm
+- Emoji picker is now case-insensitive @Johann150
 
 ### Bugfixes
 - Server: Fix GenerateVideoThumbnail failed @mei23