]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 20 Jun 2019 08:16:31 +0000 (10:16 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 20 Jun 2019 08:16:31 +0000 (10:16 +0200)
1  2 
ext/gd/gd.c
ext/opcache/Optimizer/block_pass.c
ext/opcache/Optimizer/zend_inference.c

diff --cc ext/gd/gd.c
Simple merge
Simple merge