]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 27 Mar 2019 11:43:23 +0000 (12:43 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 27 Mar 2019 11:43:23 +0000 (12:43 +0100)
1  2 
Zend/zend_inheritance.c

Simple merge