diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-06-21 00:28:17 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-06-21 00:28:17 -0700 |
| commit | 7c389e842922b5a6a5030f46fb4e24dcd1dc4ae9 (patch) | |
| tree | ce7ed8773821b35004011586976263da6991a331 /sapi/cli/php_cli_server.c | |
| parent | 8705254f2d4f73e22f150bc501fa534e7742754b (diff) | |
| parent | 5b90a8bd7c5774f4f2cd0d1190886c760356dda9 (diff) | |
| download | php-git-7c389e842922b5a6a5030f46fb4e24dcd1dc4ae9.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Now the right bug #
Fix NEWS
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions