Merge pull request #1375 from dpfaffenbauer/release/2.1.7

[2.1.7] prepare release
coreshop · May 4, 2020 · 91bc180 · 91bc180
2 parents 58a325d + b978592
commit 91bc180
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG-2.1.x.md b/CHANGELOG-2.1.x.md
@@ -1,5 +1,9 @@
 # Within 2.1
 
+## 2.1.7
+ - Bugs:
+    - [Pimcore] fix getDataForEditmode (https://github.com/coreshop/CoreShop/pull/1372, https://github.com/coreshop/CoreShop/pull/1361)
+
 ## 2.1.6
  - Bugs:
     - [CoreBundle][2.1] Fix name of country combo (https://github.com/coreshop/CoreShop/pull/1350)

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