Merge pull request #1230 from dpfaffenbauer/release/2.0.12

[2.0.12] prepare release
coreshop · Jan 14, 2020 · f015bb1 · f015bb1
2 parents 87eeb84 + 74f0a04
commit f015bb1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG-2.0.x.md b/CHANGELOG-2.0.x.md
@@ -1,5 +1,11 @@
 # Within V2
 
+## 2.0.12
+ - Translations:
+   - New Crowdin translations (https://github.com/coreshop/CoreShop/pull/1165)
+ - Tests
+   - [Tests] add conflict for monolog (https://github.com/coreshop/CoreShop/pull/1178)
+
 ## 2.0.11
  - Bugs:
    - [IndexBundle] use doctrine schema-config to create index-table schema (https://github.com/coreshop/CoreShop/pull/1142)

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