Mergeback of security release 2.6.2

4 files changed, 6 insertions, 2 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
diff --git a/changelog.d/mergeback-2.6.2.skip b/changelog.d/mergeback-2.6.2.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ 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
deleted file mode 100644
index d880680d1..000000000
--- a/changelog.d/mrf_steal_emoji-path.security
+++ /dev/null
@@ -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
index 582092aef..b707a20a8 100644
--- 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(),