summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-04-22 02:07:19 +0000
committerkaniini <nenolod@gmail.com>2019-04-22 02:07:19 +0000
commit7fcbda702e76b6390076c28832f5aea80086d15a (patch)
tree265bf6acf11ad7987850c8733ea1b36248cc8c24 /CHANGELOG.md
parent6c0e07b8bdc85f757e2d1e6993e64f2e1540deb6 (diff)
parent3cefdc62e0dda75985221853fb123572d6fc068b (diff)
downloadpleroma-7fcbda702e76b6390076c28832f5aea80086d15a.tar.gz
pleroma-7fcbda702e76b6390076c28832f5aea80086d15a.zip
Merge branch 'rework-emoji-management' into 'develop'
Remove finmoji and add a way to download emojis in packs Closes #817 and #821 See merge request pleroma/pleroma!1073
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca056fc71..ed078bc69 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