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

Commit

Permalink
Merging develop to master in preparation for 1.4.0 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed Jan 9, 2019
2 parents 84d3609 + 81af0b9 commit 79d0b7d
Show file tree
Hide file tree
Showing 5 changed files with 233 additions and 81 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ All notable changes to this project will be documented in this file, in reverse

Releases prior to 1.2.0 did not have entries.

## 1.3.2 - TBD
## 1.4.0 - 2019-01-09

### Added

- Nothing.

### Changed

- Nothing.
- [#95](https://github.com/zendframework/zenddiagnostics/pull/95) changes the minimum supported version of sensiolabs/security-checker from 1.3 to 5.0.

### Deprecated

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"php-amqplib/php-amqplib": "^2.0",
"phpunit/phpunit": "^5.7.27 || 6.5.8 || ^7.1.2",
"predis/predis": "^1.0",
"sensiolabs/security-checker": "^1.3",
"sensiolabs/security-checker": "^5.0",
"symfony/yaml": "^2.7 || ^3.0 || ^4.0",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-loader": "^2.0"
Expand Down Expand Up @@ -56,8 +56,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.3.x-dev",
"dev-develop": "1.4.x-dev"
"dev-master": "1.4.x-dev",
"dev-develop": "1.5.x-dev"
}
},
"scripts": {
Expand Down
Loading

0 comments on commit 79d0b7d

Please sign in to comment.