Bump version to 2.6.1

10 files changed, 12 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 394eb5179..f9fc0cd68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,17 @@ 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.1
+### Changed
+- - Document maximum supported version of Erlang & Elixir
+
+### Added
+- [docs] add frontends management documentation
+
+### Fixed
+- TwitterAPI: Return proper error when healthcheck is disabled
+- - Fix eblurhash and elixir-captcha not using system cflags
+
 ## 2.6.0
 ### Security
 - Preload: Make generated JSON html-safe. It already was html safe because it only consists of config data that is base64 encoded, but this will keep it safe it that ever changes.
diff --git a/changelog.d/akkoma-xml-remote-entities.security b/changelog.d/akkoma-xml-remote-entities.security
deleted file mode 100644
index 5e6725e5b..000000000
--- a/changelog.d/akkoma-xml-remote-entities.security
+++ /dev/null
@@ -1 +0,0 @@
-Fix XML External Entity (XXE) loading vulnerability allowing to fetch arbitary files from the server's filesystem
diff --git a/changelog.d/check-attachment-attribution.security b/changelog.d/check-attachment-attribution.security
deleted file mode 100644
index e0e46525b..000000000
--- a/changelog.d/check-attachment-attribution.security
+++ /dev/null
@@ -1 +0,0 @@
-CommonAPI: Prevent users from accessing media of other users by creating a status with reused attachment ID
diff --git a/changelog.d/docs-max-elixir-erlang.change b/changelog.d/docs-max-elixir-erlang.change
deleted file mode 100644
index a58b7fc17..000000000
--- a/changelog.d/docs-max-elixir-erlang.change
+++ /dev/null
@@ -1 +0,0 @@
-- Document maximum supported version of Erlang & Elixir
diff --git a/changelog.d/emoji-pack-sanitization.security b/changelog.d/emoji-pack-sanitization.security
deleted file mode 100644
index f3218abd4..000000000
--- a/changelog.d/emoji-pack-sanitization.security
+++ /dev/null
@@ -1 +0,0 @@
-Emoji pack loader sanitizes pack names
diff --git a/changelog.d/frontend-management.add b/changelog.d/frontend-management.add
deleted file mode 100644
index b85cddd96..000000000
--- a/changelog.d/frontend-management.add
+++ /dev/null
@@ -1 +0,0 @@
-[docs] add frontends management documentation
diff --git a/changelog.d/healthcheck-disabled-error.fix b/changelog.d/healthcheck-disabled-error.fix
deleted file mode 100644
index 984384a52..000000000
--- a/changelog.d/healthcheck-disabled-error.fix
+++ /dev/null
@@ -1 +0,0 @@
-TwitterAPI: Return proper error when healthcheck is disabled
diff --git a/changelog.d/otp_perms.security b/changelog.d/otp_perms.security
deleted file mode 100644
index a3da1c677..000000000
--- a/changelog.d/otp_perms.security
+++ /dev/null
@@ -1 +0,0 @@
-- Reduced permissions of config files and directories, distros requiring greater permissions like group-read need to pre-create the directories
\ No newline at end of file
diff --git a/changelog.d/system-cflags.fix b/changelog.d/system-cflags.fix
deleted file mode 100644
index 84de5ad57..000000000
--- a/changelog.d/system-cflags.fix
+++ /dev/null
@@ -1 +0,0 @@
-- Fix eblurhash and elixir-captcha not using system cflags
diff --git a/mix.exs b/mix.exs
index 82fcf5f1e..d420c11e4 100644
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("2.6.0"),
+      version: version("2.6.1"),
       elixir: "~> 1.11",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix] ++ Mix.compilers(),