granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a492fe2 63934ea)

author	Joe Watkins <krakjoe@php.net>
	Tue, 27 Mar 2018 19:57:28 +0000 (21:57 +0200)
committer	Joe Watkins <krakjoe@php.net>
	Tue, 27 Mar 2018 19:58:24 +0000 (21:58 +0200)
commit	3e267ca91bdde9430db3236602652c4fbf2580fa
tree	b8b1da98066db4d08343230f44577c6daa17731b	tree \| snapshot
parent	a492fe213a0d39520a4b4086fc101b20c1175f59	commit \| diff
parent	63934ea71e719cfc43e94167474f936d8da938de	commit \| diff

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
Fix #76131 some arginfo params are different from the documentation

NEWS	diff1 \|	diff2 \|	blob \| history
ext/date/php_date.c	diff1 \|	diff2 \|	blob \| history
ext/spl/spl_array.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.