Merge pull request #2310 from dpfaffenbauer/release/3.1.0

[Release] 3.1.0
coreshop · Jun 6, 2023 · 22b2922 · 22b2922
2 parents a337c4c + 2e6a6b1
commit 22b2922
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG-3.1.x.md b/CHANGELOG-3.1.x.md
@@ -0,0 +1,11 @@
+# 3.1.0
+
+## Bugs
+ - [Performance] optimization (https://github.com/coreshop/CoreShop/pull/2265)
+
+## Features
+ - [WishlistBundle] new feature: wishlist cleaner (https://github.com/coreshop/CoreShop/pull/2234, https://github.com/coreshop/CoreShop/pull/2267)
+ - [OrderBundle] introduce not-combinable price rule condition (https://github.com/coreshop/CoreShop/pull/2253)
+ - [ClassDefinitionPatchBundle] Introduce new Bundle to allow patching Pimcore Class Definitions (https://github.com/coreshop/CoreShop/pull/2279)
+ - [Tracking] add Google Analytics 4 Tracking (https://github.com/coreshop/CoreShop/pull/2303)
+ - [Payment] Introduce Payment Provider Rules for conditionally selecting Payment Providers or adding Payment Fees (https://github.com/coreshop/CoreShop/pull/2301)
diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -22,9 +22,9 @@ final class Version
 {
     public const MAJOR_VERSION = '3';
 
-    public const MINOR_VERSION = '0';
+    public const MINOR_VERSION = '1';
 
-    public const RELEASE_VERSION = '6';
+    public const RELEASE_VERSION = '0';
 
     public const EXTRA_VERSION = '';