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/17'
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-mabe committed Sep 9, 2015
2 parents 9ee221e + f97c71b commit e47212e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ All notable changes to this project will be documented in this file, in reverse
- [#15](https://github.com/zendframework/zend-cache/pull/15) fixes an issue
observed on HHVM when merging a list of memcached servers to add to the
storage resource.
- [#17](https://github.com/zendframework/zend-cache/pull/17) Composer: moved
`zendframework/zend-serializer` from `require` to `require-dev` as using the
serializer is optional.

## 2.5.2 - 2015-07-16

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"php": ">=5.5",
"zendframework/zend-stdlib": "~2.5",
"zendframework/zend-servicemanager": "~2.5",
"zendframework/zend-serializer": "~2.5",
"zendframework/zend-eventmanager": "~2.5"
},
"require-dev": {
"zendframework/zend-serializer": "~2.5",
"zendframework/zend-session": "~2.5",
"fabpot/php-cs-fixer": "1.7.*",
"phpunit/PHPUnit": "~4.0"
Expand Down

0 comments on commit e47212e

Please sign in to comment.