]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 16 Mar 2017 11:57:36 +0000 (12:57 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 16 Mar 2017 11:57:36 +0000 (12:57 +0100)
1  2 
ext/standard/basic_functions.c

Simple merge