Merge branch 'feature/22' into develop

Close #22
zfcampus · Aug 24, 2017 · eb1604e · eb1604e
2 parents d9baa20 + 2a02974
commit eb1604e
Show file tree

Hide file tree

Showing 3 changed files with 292 additions and 220 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,12 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.3.0 - TBD
+## 1.3.0 - 2017-08-24
 
 ### Added
 
-- Nothing.
+- [#22](https://github.com/zfcampus/zf-configuration/pull/22) adds support for
+  zend-config v3 releases.
 
 ### Deprecated
 

diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "zendframework/zend-config": "^2.6",
+        "zendframework/zend-config": "^2.6 || ^3.0",
         "zendframework/zend-modulemanager": "^2.7.1",
         "zendframework/zend-stdlib": "^2.7.7 || ^3.0.1"
     },