granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 68e27b0 45ac5ed)

author	Anatol Belski <ab@php.net>
	Tue, 24 Oct 2017 16:36:56 +0000 (18:36 +0200)
committer	Anatol Belski <ab@php.net>
	Tue, 24 Oct 2017 16:36:56 +0000 (18:36 +0200)
commit	e19bf29b53684132f3a69e25062ab5db9a7bf6e5
tree	04fb696215fd86267f6e5836d8897c9c789a4eb4	tree \| snapshot
parent	68e27b0763014b35b808e13ee12617216bd740b2	commit \| diff
parent	45ac5edbd91887ac8346a555e7d0e321a4c9c510	commit \| diff

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
Parametrize the expected value to avoid platform false positives

ext/date/tests/bug53437_var3.phpt

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