Merge pull request #1295 from dpfaffenbauer/release/2.1.4

[2.1.4] prepare release
coreshop · Feb 20, 2020 · 95d5165 · 95d5165
2 parents bac54b9 + 04d031c
commit 95d5165
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG-2.1.x.md b/CHANGELOG-2.1.x.md
@@ -1,5 +1,14 @@
 # Within 2.1
 
+## 2.1.4
+ - Feature:
+    - [CoreBundle] allow store-values to be reset and inherit again (https://github.com/coreshop/CoreShop/pull/1273)
+ - Bugs:
+    - [IndexBundle] Change return type of WorkerInterface::getList (https://github.com/coreshop/CoreShop/pull/1280)
+    - [ThemeBundle] fix default theme-resolvers (https://github.com/coreshop/CoreShop/pull/1281)
+    - [Pimcore] make compatible with Pimcore 6.5 (https://github.com/coreshop/CoreShop/pull/1285)
+    - [Core] fix bug where we calculated item-discount and item-discount-prices (https://github.com/coreshop/CoreShop/pull/1293)
+
 ## 2.1.3
  - Bugs:
     - [Address, Order, Core] fix release (https://github.com/coreshop/CoreShop/pull/1269)

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 = '1';
-    const RELEASE_VERSION = '3';
+    const RELEASE_VERSION = '4';
     const EXTRA_VERSION = '';
 
     /**