diff options
| author | Nikita Popov <nikic@php.net> | 2012-06-23 21:15:59 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-06-23 21:15:59 +0200 |
| commit | d68b614b09b984e915db50b72430db4e4731480c (patch) | |
| tree | 2826c121a85bb3556dffdf971709574efd80d3a2 /ext/standard/basic_functions.c | |
| parent | 1fc5659ebd6f2898ab474087f7877bcc4e774403 (diff) | |
| parent | 36fa17a5fae84ab332366a202f0a709279a2466a (diff) | |
| download | php-git-d68b614b09b984e915db50b72430db4e4731480c.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Improve json_encode error handling
- BFN
- BFN
Diffstat (limited to 'ext/standard/basic_functions.c')
0 files changed, 0 insertions, 0 deletions