Merge remote-tracking branch 'origin/stable' into mergeback

2022-01-14 12:37:00 -06:00 · 2022-01-14 12:37:00 -06:00 · a4436bcc3f
commit a4436bcc3f
parent 84dcb55b0f 62a45747d9
109 changed files with 181 additions and 119 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -42,6 +42,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

 ### Removed

+## 2.4.2 - 2022-01-10
+
+### Fixed
+- Federation issues caused by HTTP pool checkout timeouts
+- Compatibility with Elixir 1.13
+
+### Upgrade notes
+
+1. Restart Pleroma
+
 ## 2.4.1 - 2021-08-29

 ### Changed