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

Commit b3b0432

Browse files
committed
Merge branch 'versions/2.6.0'
2.6.0 readiness
2 parents bf28d0f + b5fdd73 commit b3b0432

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

CHANGELOG.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,6 @@ All notable changes to this project will be documented in this file, in reverse
2222
[#95](https://github.com/zendframework/zend-inputfilter/pull/95), and
2323
[#96](https://github.com/zendframework/zend-inputfilter/pull/96) update the
2424
component to be forwards-compatible with zend-servicemanager v3.
25-
26-
## 2.5.6 - TBD
27-
28-
### Added
29-
30-
- Nothing.
31-
32-
### Deprecated
33-
34-
- Nothing.
35-
36-
### Removed
37-
38-
- Nothing.
39-
40-
### Fixed
41-
4225
- [#72](https://github.com/zendframework/zend-inputfilter/pull/72) `ArrayInput`
4326
value is properly reset after `BaseInputFilter::setData()`
4427

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
"prefer-stable": true,
3131
"extra": {
3232
"branch-alias": {
33-
"dev-master": "2.5-dev",
34-
"dev-develop": "2.6-dev"
33+
"dev-master": "2.6-dev",
34+
"dev-develop": "2.7-dev"
3535
}
3636
},
3737
"autoload-dev": {

0 commit comments

Comments
 (0)