diff options
author | Anatol Belski <ab@php.net> | 2016-03-08 13:16:08 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2016-03-08 13:16:08 +0100 |
commit | 7a4c2fa829bc5a5ae731febe2cf7a74167012e37 (patch) | |
tree | b559c8f5155d154713477cd28a56c3311e8ebe6a /sapi/cli/php_cli.c | |
parent | 89a43425072feda1fc5546aaaaa7be7737c4f197 (diff) | |
parent | 8ca02bb233978493d9299a8abd29f01d1077bea6 (diff) | |
download | php-git-7a4c2fa829bc5a5ae731febe2cf7a74167012e37.tar.gz |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix regression introduced in 5683b6fa39
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions