]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 23 Jun 2017 11:31:39 +0000 (13:31 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 23 Jun 2017 11:31:39 +0000 (13:31 +0200)
1  2 
ext/standard/php_smart_string.h

Simple merge