]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 14 Feb 2019 09:02:58 +0000 (10:02 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 14 Feb 2019 09:02:58 +0000 (10:02 +0100)
1  2 
Zend/zend_portability.h
configure.ac

Simple merge
diff --cc configure.ac
Simple merge