]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea8370c 9eb726b)
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 16 Apr 2014 07:48:31 +0000 (09:48 +0200)
committerAnatol Belski <ab@php.net>
Wed, 16 Apr 2014 07:48:31 +0000 (09:48 +0200)
* PHP-5.5:
  Fixed bug #67079 Missing MIME types for XML/XSL files

1  2 
sapi/cli/php_cli_server.c patch | diff1 | diff2 | blob | history

diff --cc sapi/cli/php_cli_server.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.