summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2021-01-19 12:59:24 +0300
committerrinpatch <rinpatch@sdf.org>2021-01-19 12:59:24 +0300
commit79bc4bcc3cb89bb5860470626df5f02991b95885 (patch)
tree79d2a261bd556390702461ed3f2bb40ba39a143f
parent83ae77ae0cd1b64ca4b5dbd8f92f1d8d58509b3a (diff)
parentc2186a62d54043ea9638d33f80c7576aba9783e8 (diff)
Merge branch 'stable' into mergeback/2.2.2
-rw-r--r--CHANGELOG.md9
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