From b0eb6562326e4123394818f63eb5efd53d07c211 Mon Sep 17 00:00:00 2001
From: Anca Lita <27920906+ancalita@users.noreply.github.com>
Date: Tue, 10 Oct 2023 13:24:17 +0100
Subject: [PATCH] prepared release of version 3.6.12

---
 CHANGELOG.mdx             | 8 ++++++++
 changelog/12904.bugfix.md | 1 -
 changelog/12906.bugfix.md | 1 -
 pyproject.toml            | 2 +-
 rasa/version.py           | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)
 delete mode 100644 changelog/12904.bugfix.md
 delete mode 100644 changelog/12906.bugfix.md

diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx
index 51f895d6504e..14c7da88d3b8 100644
--- a/CHANGELOG.mdx
+++ b/CHANGELOG.mdx
@@ -16,6 +16,14 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->
 
 <!-- TOWNCRIER -->
 
+## [3.6.12] - 2023-10-10
+                        
+Rasa 3.6.12 (2023-10-10)                         
+### Bugfixes
+- [#12904](https://github.com/rasahq/rasa/issues/12904): Refresh headers used in requests (e.g. action server requests) made by `EndpointConfig` using its `headers` attribute.
+- [#12906](https://github.com/rasahq/rasa/issues/12906): Upgrade `pillow` to `10.0.1` to address security vulnerability CVE-2023-4863 found in `10.0.0` version.
+
+
 ## [3.6.11] - 2023-10-05
                         
 Rasa 3.6.11 (2023-10-05)                         
diff --git a/changelog/12904.bugfix.md b/changelog/12904.bugfix.md
deleted file mode 100644
index da070b945e51..000000000000
--- a/changelog/12904.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-Refresh headers used in requests (e.g. action server requests) made by `EndpointConfig` using its `headers` attribute.
diff --git a/changelog/12906.bugfix.md b/changelog/12906.bugfix.md
deleted file mode 100644
index d02a0e18228f..000000000000
--- a/changelog/12906.bugfix.md
+++ /dev/null
@@ -1 +0,0 @@
-Upgrade `pillow` to `10.0.1` to address security vulnerability CVE-2023-4863 found in `10.0.0` version.
diff --git a/pyproject.toml b/pyproject.toml
index 1670c346888c..904736791eeb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ exclude = "((.eggs | .git | .pytest_cache | build | dist))"
 
 [tool.poetry]
 name = "rasa"
-version = "3.6.11"
+version = "3.6.12"
 description = "Open source machine learning framework to automate text- and voice-based conversations: NLU, dialogue management, connect to Slack, Facebook, and more - Create chatbots and voice assistants"
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
diff --git a/rasa/version.py b/rasa/version.py
index d4c4e19def6f..98e1d7a3ca12 100644
--- a/rasa/version.py
+++ b/rasa/version.py
@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.6.11"
+__version__ = "3.6.12"