Merge branch 'hotfix/23'

Close #25 Fixes #23
zendframework · Mar 21, 2016 · 8048625 · 8048625
2 parents 57d0bec + f7f5945
commit 8048625
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.6.1 - TBD
+## 2.6.1 - 2016-03-21
 
 ### Added
 
@@ -18,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#25](https://github.com/zendframework/zend-navigation/pull/25) ups the
+  minimum zend-view version to 2.6.5, to bring in a fix for a circular
+  dependency issue in the navigation helpers.
 
 ## 2.6.0 - 2016-02-24
 

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "zendframework/zend-permissions-acl": "^2.6",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
         "zendframework/zend-uri": "^2.5",
-        "zendframework/zend-view": "^2.6.3",
+        "zendframework/zend-view": "^2.6.5",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/phpunit": "^4.5"
     },

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