]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorYasuo Ohgaki <yohgaki@php.net>
Thu, 8 Sep 2016 04:32:47 +0000 (13:32 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Thu, 8 Sep 2016 04:32:47 +0000 (13:32 +0900)
* PHP-7.0:
  Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset

1  2 
ext/mbstring/mbstring.c

Simple merge