Merge pull request #4935 from akeneo/PIM-5790-release

PIM-5790: prepare 1.6.0 release
akeneo · Aug 30, 2016 · 68d8015 · 68d8015
2 parents d5382bc + 44dadba
commit 68d8015
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG-1.6.md b/CHANGELOG-1.6.md
@@ -2,6 +2,10 @@
 
 ## Bug fixes
 
+# 1.6.0 (2016-08-30)
+
+## Bug fixes
+
 # 1.6.0-RC1 (2016-08-29)
 
 ## Bug fixes

diff --git a/src/Pim/Bundle/CatalogBundle/Version.php b/src/Pim/Bundle/CatalogBundle/Version.php
@@ -12,10 +12,10 @@
 class Version
 {
     /** @staticvar string */
-    const VERSION = '1.6.0-RC1';
+    const VERSION = '1.6.0';
 
     /** @staticvar string */
-    const VERSION_CODENAME = '';
+    const VERSION_CODENAME = 'Wackiki Wabbit';
 
     /** @staticvar string */
     const EDITION = 'CE';