]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9de44a2 5234c29)
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Fri, 21 Nov 2014 06:37:05 +0000 (07:37 +0100)
committerRemi Collet <remi@php.net>
Fri, 21 Nov 2014 06:37:05 +0000 (07:37 +0100)
* PHP-5.6:
  add test for #68391
  NEWS
  NEWS
  Fixed bug #68391 Returns the pool config files in order

1  2 
sapi/fpm/fpm/fpm_conf.c patch | diff1 | diff2 | blob | history

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