Skip to content

Commit

Permalink
Merge pull request #29 from php-http/prepare-release
Browse files Browse the repository at this point in the history
allow the whole range of react stream pre-releases
  • Loading branch information
dbu authored Dec 21, 2017
2 parents 04d465b + 77ab22b commit 3671060
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Change Log

## 2.1.0 - 2017-12-20
## 2.1.0 - 2017-12-21

### Changed

Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"php-http/httplug": "^1.0",
"react/http-client": "^0.4.8 || ^0.5",
"react/dns": "^0.4.1",
"react/stream": "^0.4.3 || ^0.7",
"react/socket": "^0.8",
"php-http/discovery": "^1.0"
},
Expand Down Expand Up @@ -44,7 +43,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
"dev-master": "2.1-dev"
}
}
}

0 comments on commit 3671060

Please sign in to comment.