summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authormarcin mikołajczak <git@mkljczk.pl>2024-02-22 11:59:15 +0100
committermarcin mikołajczak <git@mkljczk.pl>2024-02-22 21:05:20 +0100
commitc592a0e58d7207532f2f7be2fff788c9dc695fb5 (patch)
tree74477cba37813c549a05d692ae04c135793496a1 /CHANGELOG.md
parentdef088ce520ffac3e200cbf63b049f1d918d2b79 (diff)
parentf0468697cd74f4ec062f9c6feda53cfbe9e4500c (diff)
downloadpleroma-c592a0e58d7207532f2f7be2fff788c9dc695fb5.tar.gz
pleroma-c592a0e58d7207532f2f7be2fff788c9dc695fb5.zip
Merge remote-tracking branch 'origin/develop' into HEAD
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
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 e071fe693..063d51d4c 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