]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Wed, 22 Jan 2020 09:32:06 +0000 (10:32 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Wed, 22 Jan 2020 09:32:06 +0000 (10:32 +0100)
* PHP-7.4:
  Fix #79154: mb_convert_encoding() can modify $from_encoding


Trivial merge