summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2024-02-20 08:43:07 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2024-02-20 08:43:07 +0000
commitfb4aa9f7250ecfcbd506f70cf8ac6732564a6b26 (patch)
tree5997090e10f3b9d337ea557de21e96a0b9a3e992 /CHANGELOG.md
parent6722b7f395f7da629d9c39b8c6eeb18ac8f500bc (diff)
parentbe075a43363519505dcfe2dba1fbb19e0326b668 (diff)
Merge branch 'release/2.6.2' into 'stable'v2.6.2stable
Security Release 2.6.2 See merge request pleroma/pleroma!4074
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83b3065ce..92e5e6134 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+## 2.6.2
+
+### Security
+- MRF StealEmojiPolicy: Sanitize shortcodes (thanks to Hazel K for the report
+
## 2.6.1
### Changed
- - Document maximum supported version of Erlang & Elixir