diff options
author | Remi Collet <remi@php.net> | 2014-01-29 09:57:04 +0100 |
---|---|---|
committer | Remi Collet <remi@php.net> | 2014-01-29 09:57:04 +0100 |
commit | 0fad6dbef3853244342c0238bd23b14b41bed279 (patch) | |
tree | b46471b393a842bfc5ed8e95429701654ea89c6f /ext/zip/php_zip.h | |
parent | a6ac64bdbbf9e299377d0e9a063f496e7fcdc99a (diff) | |
parent | da84f3af751aa9bbf76bc22924a488f981d47088 (diff) | |
download | php-git-0fad6dbef3853244342c0238bd23b14b41bed279.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
Diffstat (limited to 'ext/zip/php_zip.h')
0 files changed, 0 insertions, 0 deletions