pleroma

commit: e149ee6e225667ca964e30a08179ca84b8537aaf
parent 7d624c4750dcf53d48cc65874c832513f2b03fbc
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Tue, 20 Feb 2024 09:16:36 +0100

Mergeback of security release 2.6.2

Diffstat:
M
CHANGELOG.md
5
+++++
A
changelog.d/mergeback-2.6.2.skip
0

D
changelog.d/mrf_steal_emoji-path.security
2
--
M
mix.exs
2
+-

4 files changed, 6 insertions(+), 3 deletions(-)
diff --git 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
diff --git a/changelog.d/mergeback-2.6.2.skip b/changelog.d/mergeback-2.6.2.skip
diff --git a/changelog.d/mrf_steal_emoji-path.security b/changelog.d/mrf_steal_emoji-path.security
@@ -1 +0,0 @@
-StealEmojiPolicy: Sanitize shortcodes (thanks to Hazel K for the report)
-\ No newline at end of file
diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("2.6.51"),
+      version: version("2.6.52"),
       elixir: "~> 1.11",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: Mix.compilers(),