diff options
author | Joe Watkins <krakjoe@php.net> | 2017-02-03 06:00:53 +0000 |
---|---|---|
committer | Joe Watkins <krakjoe@php.net> | 2017-02-03 06:00:53 +0000 |
commit | e9209e15a21e563defe02e0ce71f13bfa0dfbedd (patch) | |
tree | 4b39343cc7a14151b260a02a2951e8894c5b6929 /main/php_variables.c | |
parent | a52afd27ab53ba94d0e3b0d95cbfe557eeb5bfbc (diff) | |
parent | 75ad2b301a047209e7b5a6b5912eb589cfbc773d (diff) | |
download | php-git-e9209e15a21e563defe02e0ce71f13bfa0dfbedd.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
increase wait time in timeout_variation_9.phpt by 1 second
Diffstat (limited to 'main/php_variables.c')
0 files changed, 0 insertions, 0 deletions