Merge pull request #1396 from dpfaffenbauer/release/2.1.8

[2.1.8] prepare release
coreshop · May 11, 2020 · 2273f57 · 2273f57
2 parents 1b1ed80 + a1bca94
commit 2273f57
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG-2.1.x.md b/CHANGELOG-2.1.x.md
@@ -1,5 +1,13 @@
 # Within 2.1
 
+## 2.1.8
+ - Bugs:
+    - [ResourceBundle] Fix unique entity validator (https://github.com/coreshop/CoreShop/pull/1385)
+    - [DataHub] fix integration (https://github.com/coreshop/CoreShop/pull/1389)
+
+ - Features:
+    - [WorkflowBundle] Add enabled option to workflow callbacks (https://github.com/coreshop/CoreShop/pull/1392)
+
 ## 2.1.7
  - Bugs:
     - [Pimcore] fix getDataForEditmode (https://github.com/coreshop/CoreShop/pull/1372, https://github.com/coreshop/CoreShop/pull/1361)

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