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

PIM-5790: prepare 1.6.0 release
akeneo · Aug 30, 2016 · 4956c0e · 4956c0e
2 parents bfc6420 + a1b31bd
commit 4956c0e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG-1.6.md b/CHANGELOG-1.6.md
@@ -2,13 +2,21 @@
 
 ## Bug fixes
 
+# 1.6.0 (2016-08-30)
+
+## Bug fixes
+
 # 1.6.0-RC1 (2016-08-29)
 
 ## Bug fixes
 
 - #4879: Fix collision when using several popins on the same page, cheers @dimitri-koenig!
 - PIM-5928: Export products without media
 
+## Functional improvements
+
+- PIM-5701: Add CSV and XLSX import jobs for currencies, channels, locales, group types and attribute groups
+
 # 1.6.0-ALPHA2 (2016-08-23)
 
 ## Bug fixes

diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         }
     },
     "require": {
-        "akeneo/pim-community-dev": "v1.6.0-RC1"
+        "akeneo/pim-community-dev": "v1.6.0"
     },
     "require-dev": {
         "doctrine/migrations": "1.2.2",