]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorChristoph M. Becker <cmbecker69@gmx.de>
Fri, 13 Apr 2018 13:36:15 +0000 (15:36 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Fri, 13 Apr 2018 13:36:15 +0000 (15:36 +0200)
* PHP-7.2:
  Fix arginfo for array_replace(_recursive) and array_merge(_recursive)

1  2 
ext/standard/array.c
ext/standard/basic_functions.c

Simple merge
Simple merge