mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-5.6' into PHP-7.0
This commit is contained in:
@@ -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 =
|
||||
|
||||
@@ -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 =
|
||||
|
||||
Reference in New Issue
Block a user