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

Commit

Permalink
1.2.0 readiness
Browse files Browse the repository at this point in the history
- Set date in CHANGELOG
- Updated `composer.json`:
  - Use `^5.4.8 || ^7.0` for PHP requirement
  - Update branch aliases:
    - dev-master => 1.2-dev
    - dev-develop => 1.3-dev
  • Loading branch information
weierophinney committed Mar 17, 2016
1 parent 3795010 commit 0575d43
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Versions prior to 1.0 were originally released as `phly/conduit`; please visit
its [CHANGELOG](https://github.com/phly/conduit/blob/master/CHANGELOG.md) for
details.

## 1.2.0 - TBD
## 1.2.0 - 2016-03-17

This release contains two potential backwards compatibility breaks:

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
},
"extra": {
"branch-alias": {
"dev-master": "1.0-dev",
"dev-develop": "1.1-dev"
"dev-master": "1.2-dev",
"dev-develop": "1.3-dev"
}
},
"require": {
"php": ">=5.4.8",
"php": "^5.4.8 || ^7.0",
"psr/http-message": "~1.0.0",
"zendframework/zend-escaper": "~2.3"
},
Expand Down

0 comments on commit 0575d43

Please sign in to comment.