]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorChristopher Jones <sixd@php.net>
Fri, 20 Sep 2013 03:23:18 +0000 (20:23 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 20 Sep 2013 03:23:18 +0000 (20:23 -0700)
* PHP-5.5:
  Added application/pdf to PHP CLI Web Server mime types.

1  2 
sapi/cli/php_cli_server.c

Simple merge