Merge branch 'hotfix/helpers-v5-support'

Close #26
zendframework · Dec 12, 2017 · 848a707 · 848a707
2 parents 3a6e0ea + d5c935b
commit 848a707
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file, in reverse
 
 Versions prior to 0.4.0 were released as the package "weierophinney/hal".
 
+## 0.6.1 - 2017-12-12
+
+### Added
+
+- [#26](https://github.com/zendframework/zend-expressive-hal/pull/26) adds
+  support for the zend-expressive-helpers 5.0 series of releases.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 0.6.0 - 2017-11-07
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "phpunit/phpunit": "^6.4.3",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-diactoros": "^1.6",
-        "zendframework/zend-expressive-helpers": "^4.2",
+        "zendframework/zend-expressive-helpers": "^4.2 || ^5.0.0-dev || ^5.0.0",
         "zendframework/zend-hydrator": "^2.3.1",
         "zendframework/zend-paginator": "^2.7"
     },

diff --git a/composer.lock b/composer.lock