]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e81f30a 25271fe)
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 05:55:16 +0000 (05:55 +0000)
committerJoe Watkins <krakjoe@php.net>
Fri, 3 Feb 2017 05:55:16 +0000 (05:55 +0000)
* PHP-7.0:
  increase wait time in timeout_variation_10.phpt by 1 second


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.