]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorJoe Watkins <krakjoe@php.net>
Sat, 15 Jun 2019 06:09:17 +0000 (08:09 +0200)
committerJoe Watkins <krakjoe@php.net>
Sat, 15 Jun 2019 06:09:17 +0000 (08:09 +0200)
* PHP-7.4:
  fix flaky socket tests


Trivial merge