]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJoe Watkins <krakjoe@php.net>
Mon, 30 Jan 2017 11:26:37 +0000 (11:26 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 30 Jan 2017 11:26:37 +0000 (11:26 +0000)
* PHP-7.0:
  fix BC break introduced by #2346 (sebastianbergmann/phpunit#2454)

1  2 
ext/dom/document.c

Simple merge