Joe Watkins 6a03b43e5f Merge branch 'pull-request/1311' into PHP-7.0 ... * pull-request/1311: fix inappropriate warning in FPM log		2017-01-06 05:54:42 +00:00
..
fpm	Merge branch 'pull-request/1311' into PHP-7.0	2017-01-06 05:54:42 +00:00
tests	Merge branch 'PHP-5.6' into PHP-7.0	2016-11-17 15:58:38 +03:00
config.m4	Merge branch 'PHP-5.6' into PHP-7.0	2015-11-23 18:56:13 +02:00
CREDITS
init.d.php-fpm.in	Add configtest option to fpm init.d script	2015-03-08 22:48:29 +08:00
LICENSE
Makefile.frag	Merge branch 'PHP-5.6' into PHP-7.0	2016-02-08 20:29:24 +02:00
php-fpm.8.in	Happy new year (Update copyright to 2016)	2016-01-03 01:44:37 +02:00
php-fpm.conf.in	split fpm config to two parts. PR#903	2014-12-14 14:21:46 +01:00
php-fpm.service.in	Fix php-fpm.service.in	2015-05-01 15:28:55 +02:00
status.html.in	- fix r317913	2011-10-08 20:43:12 +00:00
www.conf.in	Fix minor typo	2016-12-03 14:15:52 +01:00