diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-07-21 16:31:16 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2016-07-21 16:31:16 +0200 |
| commit | bee362d5e380bd95df7c4cc8e50438184710b4f2 (patch) | |
| tree | 7e538f35132bc76c60d40f0e1ef6ad6a50564ca8 /php.ini-development | |
| parent | 462a9aa19022bb042e74d92f194a7db9fb1ce4db (diff) | |
| parent | 82bfb090ac342042aa5a966fab1307e22cfe2806 (diff) | |
| download | php-git-bee362d5e380bd95df7c4cc8e50438184710b4f2.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'php.ini-development')
| -rw-r--r-- | php.ini-development | 1 |
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 = |