]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Sun, 18 Dec 2016 16:10:54 +0000 (17:10 +0100)
committerNikita Popov <nikic@php.net>
Sun, 18 Dec 2016 16:10:54 +0000 (17:10 +0100)
1  2 
ext/reflection/php_reflection.c

Simple merge