]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b25be21 fd92b91)
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Fri, 13 Jan 2017 06:45:17 +0000 (06:45 +0000)
committerJoe Watkins <krakjoe@php.net>
Fri, 13 Jan 2017 06:45:17 +0000 (06:45 +0000)
* PHP-7.0:
  Increase wait time for tests involving sockets to improve Travis relability


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