Commit 4c6e5cb
committed
Merge remote-tracking branch 'origin/master' into 0.3
* origin/master:
Change react/promise constraints to use tilde operator
Conflicts:
composer.lock
src/React/Dns/composer.json
src/React/Stream/composer.json1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
0 commit comments