projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2038e6 505adab)
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Sun, 14 Dec 2014 08:23:25 +0000 (09:23 +0100)
committerRemi Collet <remi@php.net>
Sun, 14 Dec 2014 08:23:25 +0000 (09:23 +0100)
* PHP-5.6:
  fix typo

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.