]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 27 May 2019 07:38:33 +0000 (09:38 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 27 May 2019 07:38:33 +0000 (09:38 +0200)
1  2 
Zend/zend_API.c
Zend/zend_builtin_functions.c
Zend/zend_closures.c
Zend/zend_compile.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_inheritance.c

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