Joe Watkins aadc84f6f7 Merge branch 'PHP-7.0' into PHP-7.1 ...

* PHP-7.0:
  Fixed #73902 mention router support in usage output for php-cli

2017-01-10 06:20:56 +00:00

..

apache2handler

Merge branch 'PHP-7.0' into PHP-7.1

2017-01-05 14:02:43 +01:00

cgi

Update copyright headers to 2017

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

cli

Merge branch 'PHP-7.0' into PHP-7.1

2017-01-10 06:20:56 +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-01-08 19:03:10 +00:00

litespeed

Merge branch 'PHP-7.0' into PHP-7.1

2017-01-08 21:05:24 +00:00

phpdbg

Update copyright headers to 2017

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

tests

Merge branch 'PHP-5.6'

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