]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikic@php.net>
Sun, 1 Jan 2017 11:20:46 +0000 (12:20 +0100)
committerNikita Popov <nikic@php.net>
Sun, 1 Jan 2017 11:20:46 +0000 (12:20 +0100)
1  2 
ext/dom/php_dom.c

Simple merge