]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'upstream/PHP-7.4' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 14 Jul 2020 10:43:58 +0000 (12:43 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 14 Jul 2020 10:43:58 +0000 (12:43 +0200)
* upstream/PHP-7.4:
  Fix test for x86 Windows


Trivial merge