Merge pull request #1959 from dpfaffenbauer/release/2.2.12

[Release] 2.2.12
coreshop · Apr 8, 2022 · 09d21f9 · 09d21f9
2 parents 08d451a + 6331fa1
commit 09d21f9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG-2.2.x.md b/CHANGELOG-2.2.x.md
@@ -1,5 +1,15 @@
 # Within 2.2
 
+## 2.2.12
+ - Bugs:
+   - [FrontendBundle] Fix "Invoice Address is Shipping Address" in checkout address step (https://github.com/coreshop/CoreShop/pull/1823)
+   - [OrderBundle] cart context returns latest cart even if multiple found (https://github.com/coreshop/CoreShop/pull/1837)
+   - [FrontendBundle] Password reset: Clearer form labels (https://github.com/coreshop/CoreShop/pull/1855)
+   - [ResourceBundle] Fatal error when saving object with product-specific prices -> EntityMerger got object of wrong class (https://github.com/coreshop/CoreShop/pull/1864)
+   - [ProductBundle] Add isEqual() for product-specific price (https://github.com/coreshop/CoreShop/pull/1844)
+   - [Pimcore] Fix delete icons in Pimcore backend (https://github.com/coreshop/CoreShop/pull/1885)
+   - 
+
 ## 2.2.11
  - Bugs:
    - [CoreExtensions] refactor how Doctrine Entities are cloned (https://github.com/coreshop/CoreShop/pull/1770)

diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -16,7 +16,7 @@ final class Version
 {
     const MAJOR_VERSION = '2';
     const MINOR_VERSION = '2';
-    const RELEASE_VERSION = '11';
+    const RELEASE_VERSION = '12';
     const EXTRA_VERSION = '';
 
     /**

diff --git a/src/CoreShop/Component/Pimcore/composer.json b/src/CoreShop/Component/Pimcore/composer.json
@@ -25,7 +25,6 @@
   ],
   "require": {
     "php": "^7.2",
-    "pimcore/pimcore": "^6.6.0",
     "pimcore/pimcore": "^6.6.0"
   },
   "require-dev": {