]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 13 Dec 2017 20:25:38 +0000 (21:25 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 13 Dec 2017 20:25:38 +0000 (21:25 +0100)
1  2 
Zend/zend_API.c
Zend/zend_closures.c

diff --cc Zend/zend_API.c
Simple merge
Simple merge