diff options
| author | Julien Pauli <jpauli@php.net> | 2015-02-04 13:10:59 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-02-04 13:10:59 +0100 |
| commit | dee113ba4a8a6ea0b39980ca907c9bae2ed112c5 (patch) | |
| tree | 91a04bd3ce60c7bffb6d1ba226bf5f284efb07d2 /ext/zip/php_zip.c | |
| parent | ef058b7cb52fe845b1a4f69240324bd7f6b04575 (diff) | |
| parent | 93315c4e1d514c2824bbadc23337603314db8f63 (diff) | |
| download | php-git-dee113ba4a8a6ea0b39980ca907c9bae2ed112c5.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Revert "json_decode() should generate a syntax error when given ""."
Update NEWS
Diffstat (limited to 'ext/zip/php_zip.c')
0 files changed, 0 insertions, 0 deletions