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

Commit

Permalink
Merge branch 'hotfix/stdlib-v3'
Browse files Browse the repository at this point in the history
Close #24
  • Loading branch information
weierophinney committed Feb 18, 2016
2 parents 8530a5e + 57796aa commit 5c80bde
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 3.0.1 - TBD
## 3.0.1 - 2016-02-18

### Added

Expand All @@ -18,7 +18,8 @@ All notable changes to this project will be documented in this file, in reverse

### Fixed

- Nothing.
- [#24](https://github.com/zendframework/zend-eventmanager/pull/24) updates the
zend-stdlib dependency to `^2.7.3 || ^3.0`, allowing either major version.

## 3.0.0 - 2016-01-12

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"phpunit/PHPUnit": "~4.0",
"athletic/athletic": "^0.1",
"squizlabs/php_codesniffer": "^2.0",
"zendframework/zend-stdlib": "^2.7.3",
"zendframework/zend-stdlib": "^2.7.3 || ^3.0",
"container-interop/container-interop": "^1.1.0"
},
"suggest": {
"container-interop/container-interop": "^1.1.0, to use the lazy listeners feature",
"zendframework/zend-stdlib": "^2.7.3, to use the FilterChain feature"
"zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
}
}

0 comments on commit 5c80bde

Please sign in to comment.