]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorJoe Watkins <krakjoe@php.net>
Wed, 12 Jun 2019 07:48:09 +0000 (09:48 +0200)
committerJoe Watkins <krakjoe@php.net>
Wed, 12 Jun 2019 07:48:09 +0000 (09:48 +0200)
* PHP-7.4:
  fix flaky zip tests, order is OS dependent


Trivial merge