]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 29 Jan 2020 11:22:58 +0000 (12:22 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 29 Jan 2020 11:22:58 +0000 (12:22 +0100)
* PHP-7.4:
  Fix length inconsistency in mb_convert_encoding

1  2 
ext/mbstring/mbstring.c
ext/mbstring/tests/bug79149.phpt

Simple merge
Simple merge