]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 19 Jun 2019 14:36:29 +0000 (16:36 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 19 Jun 2019 14:36:29 +0000 (16:36 +0200)
1  2 
Zend/zend_execute.c
ext/gd/gd.c

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