diff options
| author | Julien Pauli <jpauli@php.net> | 2016-03-21 15:32:52 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-03-21 15:39:48 +0100 |
| commit | 5ba7b9af1b2a23e9cdbbf2915a271bce1317cee0 (patch) | |
| tree | 2f5fcf999d58aa877f0a790d37000b6e8a6e1991 /sapi/cli/php_cli.c | |
| parent | d26ca894020bc28eb55b153fac5548374d5ce16d (diff) | |
| parent | abbe1551d6c9c26bf198699213e6b6586ea97d88 (diff) | |
| download | php-git-5ba7b9af1b2a23e9cdbbf2915a271bce1317cee0.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Reworked Fix bug #52098
Fix bug #52098
Conflicts:
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions