]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorJoe Watkins <krakjoe@php.net>
Fri, 14 Jun 2019 10:57:47 +0000 (12:57 +0200)
committerJoe Watkins <krakjoe@php.net>
Fri, 14 Jun 2019 10:58:13 +0000 (12:58 +0200)
* PHP-7.4:
  fix mac tests on azure

1  2 
azure/macos/test.yml
ext/standard/tests/file/flock_error.phpt
sapi/cli/php_cli.c

Simple merge
Simple merge