Merge branch 'mergeback/2.2.2' into 'develop'

Mergeback/2.2.2 See merge request pleroma/pleroma!3264
2021-01-19 10:00:15 +00:00 · 2021-01-19 10:00:15 +00:00 · 984426d9c4
commit 984426d9c4
parent 83ae77ae0c 79bc4bcc3c
1 changed files with 9 additions and 0 deletions
--- 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