]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 1 May 2017 10:15:41 +0000 (12:15 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 1 May 2017 10:15:41 +0000 (12:15 +0200)
1  2 
ext/spl/spl_fixedarray.c

Simple merge