Merge pull request #12935 from RasaHQ/merge-3.6.x-main-936a8ed

Merge 3.6.x into main
RasaHQ · Oct 23, 2023 · 0dd893a · 0dd893a
2 parents a3c104a + 20e198a
commit 0dd893a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.mdx b/CHANGELOG.mdx
@@ -16,6 +16,13 @@ https://github.com/RasaHQ/rasa/tree/main/changelog/ . -->
 
 <!-- TOWNCRIER -->
 
+## [3.6.13] - 2023-10-23
+
+Rasa 3.6.13 (2023-10-23)                         
+### Bugfixes
+- [#12927](https://github.com/rasahq/rasa/issues/12927): Fix wrong conflicts that occur when rasa validate stories is run with slots that have active_loop set to null in mapping conditions.
+
+
 ## [3.6.12] - 2023-10-10
 
 Rasa 3.6.12 (2023-10-10)                         

diff --git a/changelog/12927.bugfix.md b/changelog/12927.bugfix.md