Joe Watkins 46d0933668 Merge branch 'PHP-7.0' into PHP-7.1 ...

* PHP-7.0:
  pull-request/2393:
    stop fpm make install clobbering dot d configuration

2017-02-22 06:48:48 +00:00

..

apache2handler

Merge branch 'PHP-7.0' into PHP-7.1

2017-02-08 01:10:48 +01:00

cgi

Fixed #72898 PHP_FCGI_CHILDREN is not included in phpinfo()

2017-01-12 22:06:03 +01:00

cli

Merge branch 'PHP-7.0' into PHP-7.1

2017-01-18 17:46:11 +00:00

embed

Update copyright headers to 2017

2017-01-04 11:23:42 -06:00

fpm

Merge branch 'PHP-7.0' into PHP-7.1

2017-02-22 06:48:48 +00:00

litespeed

Merge branch 'PHP-7.0' into PHP-7.1

2017-01-18 17:46:11 +00:00

phpdbg

Merge branch 'PHP-7.0' into PHP-7.1

2017-01-25 13:01:10 +01:00

tests

Merge branch 'PHP-5.6'

2015-08-11 01:42:25 +02:00