From 7382d7a1056bb484db404626d39c4b2b9f6b6f7c Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Wed, 4 Oct 2023 20:46:36 +0200 Subject: [PATCH 1/2] [Release] 3.1.2 --- CHANGELOG-3.1.x.md | 7 +++++++ src/CoreShop/Bundle/CoreBundle/Application/Version.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-3.1.x.md b/CHANGELOG-3.1.x.md index 547e0b51b3..e29b199259 100644 --- a/CHANGELOG-3.1.x.md +++ b/CHANGELOG-3.1.x.md @@ -1,3 +1,10 @@ +# 3.1.2 + +## Bugs + - [Cache] "apply CacheResourceMarshaller to doctrine_dbal adapter, add cache marshaller to MoneyCurrency (https://github.com/coreshop/CoreShop/pull/2373) + - [Core] re-add mainObjectId and objectId (https://github.com/coreshop/CoreShop/pull/2380) + - [Reports] fix reports to only select actual orders + # 3.1.1 ## Bugs diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php index b4961a60b0..a94a3488e4 100644 --- a/src/CoreShop/Bundle/CoreBundle/Application/Version.php +++ b/src/CoreShop/Bundle/CoreBundle/Application/Version.php @@ -24,7 +24,7 @@ final class Version public const MINOR_VERSION = '1'; - public const RELEASE_VERSION = '1'; + public const RELEASE_VERSION = '2'; public const EXTRA_VERSION = ''; From 01c67a3376bf6d2945b25b601e93e1175424a794 Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Wed, 4 Oct 2023 20:47:30 +0200 Subject: [PATCH 2/2] [Release] 3.1.2 --- CHANGELOG-3.1.x.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG-3.1.x.md b/CHANGELOG-3.1.x.md index e29b199259..164502bb81 100644 --- a/CHANGELOG-3.1.x.md +++ b/CHANGELOG-3.1.x.md @@ -3,7 +3,7 @@ ## Bugs - [Cache] "apply CacheResourceMarshaller to doctrine_dbal adapter, add cache marshaller to MoneyCurrency (https://github.com/coreshop/CoreShop/pull/2373) - [Core] re-add mainObjectId and objectId (https://github.com/coreshop/CoreShop/pull/2380) - - [Reports] fix reports to only select actual orders + - [Reports] fix reports to only select actual orders (https://github.com/coreshop/CoreShop/pull/2381) # 3.1.1