diff options
author | Joe Watkins <krakjoe@php.net> | 2017-01-13 06:45:17 +0000 |
---|---|---|
committer | Joe Watkins <krakjoe@php.net> | 2017-01-13 06:45:17 +0000 |
commit | 19363de12f663f20a6e0e9969c55710ca3c9fe4f (patch) | |
tree | 45e6bca44044fa8c612d5546fabaecc1a296db2e /ext/reflection/php_reflection.c | |
parent | b25be216c1dc2f27e54b59eb19582d4a951b4c7c (diff) | |
parent | fd92b911888f482d8d5794e6abac41bdff9ad3a2 (diff) | |
download | php-git-19363de12f663f20a6e0e9969c55710ca3c9fe4f.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Increase wait time for tests involving sockets to improve Travis relability
Diffstat (limited to 'ext/reflection/php_reflection.c')
0 files changed, 0 insertions, 0 deletions