Merge pull request #1332 from dpfaffenbauer/release/2.1.5

[2.1.5] prepare release
coreshop · Mar 23, 2020 · cb2ac59 · cb2ac59
2 parents 2b552dc + c03e453
commit cb2ac59
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG-2.1.x.md b/CHANGELOG-2.1.x.md
@@ -1,5 +1,12 @@
 # Within 2.1
 
+## 2.1.5
+ - Bugs:
+    - [Translations] fix: add missing translation (https://github.com/coreshop/CoreShop/pull/1308)
+    - [IndexBundle] index ui improvements (https://github.com/coreshop/CoreShop/pull/1300)
+    - [ThemeBundle] fix configuration for default resolvers (https://github.com/coreshop/CoreShop/pull/1301)
+    - [AddressBundle] introduce filter-active action and filter store-base countries by those (https://github.com/coreshop/CoreShop/pull/1302)
+
 ## 2.1.4
  - Feature:
     - [CoreBundle] allow store-values to be reset and inherit again (https://github.com/coreshop/CoreShop/pull/1273)

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