diff options
| author | Remi Collet <remi@php.net> | 2017-01-06 06:27:08 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2017-01-06 06:27:08 +0100 |
| commit | 4f1335cd4c9a726f33273468bafc31342a395aa2 (patch) | |
| tree | e9f619f5edc83351c6d7b6ac826aa206abc85a24 /ext/zip/php_zip.c | |
| parent | a7c444b939338bb5eadc2d64a2dbc16d9199fbe3 (diff) | |
| parent | db890956ecc11c090716a536b00a07f2499fa73a (diff) | |
| download | php-git-4f1335cd4c9a726f33273468bafc31342a395aa2.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
add skip when json not loaded
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions