]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c63a4f 79e05bf)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Fri, 3 Oct 2014 09:40:05 +0000 (11:40 +0200)
committerFerenc Kovacs <tyrael@php.net>
Fri, 3 Oct 2014 09:40:05 +0000 (11:40 +0200)
* PHP-5.6:
  NEWS entry for previous commit
  NEWS entry for previous commit
  add IPv6 support to php-fpm

1  2 
sapi/fpm/php-fpm.conf.in patch | diff1 | diff2 | blob | history

diff --cc sapi/fpm/php-fpm.conf.in
Simple merge
Unnamed repository; edit this file 'description' to name the repository.