Skip to content

Commit

Permalink
Merge branch 'hotfix/105'
Browse files Browse the repository at this point in the history
Close #105
  • Loading branch information
weierophinney committed May 26, 2016
2 parents 64d46ce + e59f05e commit b86a354
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ All notable changes to this project will be documented in this file, in reverse
with other methods.
- [#135](https://github.com/phly/PhlyRestfully/pull/135) adds support for PHP 7
and HHVM.
- [#107](https://github.com/phly/PhlyRestfully/pull/107) suggests using
zfr/zfr-cors to provide CORS support for your API.

### Deprecated

Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@
"zendframework/zend-navigation": "^2.5",
"zendframework/zend-servicemanager": "^2.5"
},
"suggest": {
"zfr/zfr-cors": "zfr/zfr-cors provides CORS support"
},
"autoload": {
"psr-4": {
"PhlyRestfully\\": "src/"
Expand Down

0 comments on commit b86a354

Please sign in to comment.