]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.1' into PHP-7.2
authorChristoph M. Becker <cmbecker69@gmx.de>
Fri, 13 Apr 2018 13:27:59 +0000 (15:27 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Fri, 13 Apr 2018 13:28:47 +0000 (15:28 +0200)
commit3770c2e46344a33acc23638ff929e87900a476f7
treefdbd5e74a99c0c42e91b1aabe96abfd179457fa4
parent281a1754b9e8348065bb7aa12539346b09e6393e
parentbb79e5764b2dd0671016a53ff567c8303dd184f1
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix arginfo for array_replace(_recursive) and array_merge(_recursive)
NEWS
ext/standard/array.c
ext/standard/basic_functions.c