From: Ekaterina Vaartis <vaartis@cock.li>
Date: Sat, 20 Apr 2019 12:17:21 +0000 (+0300)
Subject: Add the emoji packs & finmoji removal to the changelog
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=1f3ddb031cdc554552d80a5974b28897c1e764dc;p=akkoma

Add the emoji packs & finmoji removal to the changelog
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02bb3fde5..c778e0234 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Mastodon API: [Reports](https://docs.joinmastodon.org/api/rest/reports/)
 - ActivityPub C2S: OAuth endpoints
 - Metadata RelMe provider
+- Emoji packs and emoji pack manager
 
 ### Changed
 - **Breaking:** Configuration: move from Pleroma.Mailer to Pleroma.Emails.Mailer
@@ -50,6 +51,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Mastodon API: Remove attachment limit in the Status entity
 - Deps: Updated Cowboy to 2.6
 - Deps: Updated Ecto to 3.0.7
+- Don't ship finmoji by default, they can be installed as an emoji pack
 
 ### Fixed
 - Followers counter not being updated when a follower is blocked