]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' into PHP-7.2
authorXinchen Hui <laruence@gmail.com>
Tue, 9 Jan 2018 08:21:13 +0000 (16:21 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 9 Jan 2018 08:21:13 +0000 (16:21 +0800)
* PHP-7.1:
  Fixed bug #75781 (substr_count incorrect result)

1  2 
ext/standard/string.c

Simple merge