Mergeback of security release 2.6.2

2024-02-20 09:16:36 +01:00 · 2024-02-20 09:16:36 +01:00 · e149ee6e22
commit e149ee6e22
parent 7d624c4750
4 changed files with 6 additions and 2 deletions
--- 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
--- a/changelog.d/mergeback-2.6.2.skip
+++ b/changelog.d/mergeback-2.6.2.skip
--- 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)
--- 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(),
				`@ -1 +0,0 @@`
				`StealEmojiPolicy: Sanitize shortcodes (thanks to Hazel K for the report)`