granicus.if.org Git - php/commit

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

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f2c99e2 dd227c2)

author	Joe Watkins <krakjoe@php.net>
	Mon, 30 Jan 2017 11:26:37 +0000 (11:26 +0000)
committer	Joe Watkins <krakjoe@php.net>
	Mon, 30 Jan 2017 11:26:37 +0000 (11:26 +0000)
commit	e6bc4f39a27c8a91df48cf9ab2de76eb1b7c81c0
tree	eec0a9653135205730f5a8462769b00f7ad41b41	tree \| snapshot
parent	f2c99e201ed52da4b395d833bb6f5edbab3b2dba	commit \| diff
parent	dd227c2b23325fb7df524a3bc06c050e41b9d252	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)

ext/dom/document.c

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