diff options
author | Christoph M. Becker <cmb@php.net> | 2016-07-21 16:50:37 +0200 |
---|---|---|
committer | Christoph M. Becker <cmb@php.net> | 2016-07-21 16:50:37 +0200 |
commit | 7e2c3a77c0d548c0903ac3a3fd667e6032afee77 (patch) | |
tree | df5020e2aca970afb4006c6d93c17f168bf2d04a /php.ini-production | |
parent | a2a122804e60e3c441d7cb7b7421e2c7f9d6e5a3 (diff) | |
parent | f813f438552bf52d7d7d6213e12ad67d9e5bbeec (diff) | |
download | php-git-7e2c3a77c0d548c0903ac3a3fd667e6032afee77.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'php.ini-production')
-rw-r--r-- | php.ini-production | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/php.ini-production b/php.ini-production index f2723f63a4..536c1e89dc 100644 --- a/php.ini-production +++ b/php.ini-production @@ -686,7 +686,6 @@ default_charset = "UTF-8" ; PHP output character encoding is set to empty. ; If empty, default_charset is used. -; mbstring or iconv output handler is used. ; See also output_buffer. ; http://php.net/output-encoding ;output_encoding = |