Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Commit b78ba0d

Browse files
committed
Merge branch 'hotfix/23' into develop
Close #25
2 parents 8d511a3 + f7f5945 commit b78ba0d

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
2020

2121
- Nothing.
2222

23-
## 2.6.1 - TBD
23+
## 2.6.1 - 2016-03-21
2424

2525
### Added
2626

@@ -36,7 +36,9 @@ All notable changes to this project will be documented in this file, in reverse
3636

3737
### Fixed
3838

39-
- Nothing.
39+
- [#25](https://github.com/zendframework/zend-navigation/pull/25) ups the
40+
minimum zend-view version to 2.6.5, to bring in a fix for a circular
41+
dependency issue in the navigation helpers.
4042

4143
## 2.6.0 - 2016-02-24
4244

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"zendframework/zend-permissions-acl": "^2.6",
2727
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
2828
"zendframework/zend-uri": "^2.5",
29-
"zendframework/zend-view": "^2.6.3",
29+
"zendframework/zend-view": "^2.6.5",
3030
"fabpot/php-cs-fixer": "1.7.*",
3131
"phpunit/phpunit": "^4.5"
3232
},

composer.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)