Merged r21585 to 5.0-stable.

git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21586 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index df375f9003f5291163693bbd5d37ff849cbda8d5..fbc51259b9afea1dbff0026098026c3ace038078 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -41,6 +41,14 @@ https://www.redmine.org/
 
 * Patch #36917: Update Rails to 6.1.6
 
+=== [Security]
+
+* Patch #36912: Update Nokogiri versions to fix two critical CVE's
+
+=== [Text formatting]
+
+* Defect #36958: Crafted input breaks CommonMark Markdown formatter
+
 === [Translations]
 
 * Patch #36905: German translation update for 5.0-stable