]> granicus.if.org Git - php/commit
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)
commit9993304da4559a936246e118cfefa1bcedaa84a5
treec995aa9e68fd0dfcce90544043b74789c5f59762
parent7c65345e184d318af13e29e5f42aca57db0bdc6b
parent3770c2e46344a33acc23638ff929e87900a476f7
Merge branch 'PHP-7.2'

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