summaryrefslogtreecommitdiff
path: root/php.ini-development
diff options
context:
space:
mode:
authorChristoph M. Becker <cmb@php.net>2016-07-21 16:50:37 +0200
committerChristoph M. Becker <cmb@php.net>2016-07-21 16:50:37 +0200
commit7e2c3a77c0d548c0903ac3a3fd667e6032afee77 (patch)
treedf5020e2aca970afb4006c6d93c17f168bf2d04a /php.ini-development
parenta2a122804e60e3c441d7cb7b7421e2c7f9d6e5a3 (diff)
parentf813f438552bf52d7d7d6213e12ad67d9e5bbeec (diff)
downloadphp-git-7e2c3a77c0d548c0903ac3a3fd667e6032afee77.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'php.ini-development')
-rw-r--r--php.ini-development1
1 files changed, 0 insertions, 1 deletions
diff --git a/php.ini-development b/php.ini-development
index 604efc46a0..57738e34d5 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -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 =