]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 4 May 2020 14:30:34 +0000 (16:30 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 4 May 2020 14:30:34 +0000 (16:30 +0200)
* PHP-7.4:
  Fixed bug #79548

1  2 
Zend/zend_inheritance.c

Simple merge