]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 23 Aug 2019 15:01:49 +0000 (17:01 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 23 Aug 2019 15:01:49 +0000 (17:01 +0200)
1  2 
Zend/zend_API.c
Zend/zend_opcode.c
ext/standard/proc_open.c
ext/standard/user_filters.c
sapi/cli/php_cli.c

diff --cc Zend/zend_API.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge