diff options
| author | Adam Harvey <aharvey@php.net> | 2013-11-10 16:11:28 -0500 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2013-11-10 16:11:28 -0500 |
| commit | 304bff90f42479d412e4124c11803f384cae909d (patch) | |
| tree | 1c0abe0aa67e1807f84903f893819f1084f64873 /sapi/apache2handler/php_functions.c | |
| parent | df7321359e0c11a1de99285dee64c8e69ee28653 (diff) | |
| parent | c9cfd98bcdcd92aa0efebda6ab8a3db5605a6796 (diff) | |
| download | php-git-304bff90f42479d412e4124c11803f384cae909d.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update NEWS and remove the unnecessary UPGRADING note.
UPGRADING and NEWS
Better test: Check combined leading/trailing
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions