granicus.if.org Git - php/commit

]> granicus.if.org Git - php/commit

projects / php / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 005ba20 125ee6a)

author	Joe Watkins <krakjoe@php.net>
	Tue, 10 Jan 2017 06:20:56 +0000 (06:20 +0000)
committer	Joe Watkins <krakjoe@php.net>
	Tue, 10 Jan 2017 06:20:56 +0000 (06:20 +0000)
commit	aadc84f6f749f05bc5d6cbf4f44a21734a9c6d3f
tree	09e688ebea89dbba03911cac38a459c556fc21dd	tree \| snapshot
parent	005ba2001ddc0e84ae62e00aa4956899f85c50f8	commit \| diff
parent	125ee6a68e40d539cac5eb97def04d1586ce0e5d	commit \| diff

Merge branch 'PHP-7.0' into PHP-7.1

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

sapi/cli/php_cli.c

Unnamed repository; edit this file 'description' to name the repository.