]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 11 May 2020 08:46:07 +0000 (10:46 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 11 May 2020 08:46:07 +0000 (10:46 +0200)
* PHP-7.4:
  Fix default sendmail path when not found during build

1  2 
build/php.m4
main/main.c

diff --cc build/php.m4
Simple merge
diff --cc main/main.c
Simple merge