Merging develop to master in preparation for 1.3.0 release.

zfcampus · Aug 24, 2017 · 30e6320 · 30e6320
2 parents 28706e6 + eb1604e
commit 30e6320
Show file tree

Hide file tree

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

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"
     },