summaryrefslogtreecommitdiff
path: root/php.ini-development
diff options
context:
space:
mode:
authorChristoph M. Becker <cmb@php.net>2016-07-21 16:33:06 +0200
committerChristoph M. Becker <cmb@php.net>2016-07-21 16:33:06 +0200
commit8950fb42d9d81bbfdd1008aee38bde16d559e77e (patch)
tree6c1f31db3f97e101921cc9e8681d4327f1b6c934 /php.ini-development
parenta10d873ceefc4289b5d24c6114e2b3abf738bde4 (diff)
parentbee362d5e380bd95df7c4cc8e50438184710b4f2 (diff)
downloadphp-git-8950fb42d9d81bbfdd1008aee38bde16d559e77e.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
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 147611e1a1..04db058008 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -689,7 +689,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 =