diff options
| author | rinpatch <rinpatch@sdf.org> | 2021-01-19 10:00:15 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2021-01-19 10:00:15 +0000 |
| commit | 984426d9c4cadc59017c6770b033f4d72e497342 (patch) | |
| tree | 79d2a261bd556390702461ed3f2bb40ba39a143f | |
| parent | 83ae77ae0cd1b64ca4b5dbd8f92f1d8d58509b3a (diff) | |
| parent | 79bc4bcc3cb89bb5860470626df5f02991b95885 (diff) | |
Merge branch 'mergeback/2.2.2' into 'develop'
Mergeback/2.2.2
See merge request pleroma/pleroma!3264
| -rw-r--r-- | CHANGELOG.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 50d5f80e3..e02a1beba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,8 +59,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased (Patch) + +## [2.2.2] - 2020-01-18 + ### Fixed + - StealEmojiPolicy creates dir for emojis, if it doesn't exist. +- Updated `elixir_make` to a non-retired version + +### Upgrade notes + +1. Restart Pleroma ## [2.2.1] - 2020-12-22 |