]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 8 Feb 2017 00:00:46 +0000 (01:00 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 8 Feb 2017 00:00:46 +0000 (01:00 +0100)
1  2 
Zend/zend_portability.h

Simple merge