]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 8 May 2019 09:37:49 +0000 (11:37 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 8 May 2019 09:37:49 +0000 (11:37 +0200)
1  2 
Zend/zend_inheritance.c

Simple merge