diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-01-26 17:21:14 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-01-26 17:21:14 -0800 |
| commit | 223a62d69eeace864cb5deb45e3a56eb3ac3beaa (patch) | |
| tree | 36531bbdda12e31f7db99ec11c6f628ef85d37a4 /ext/json/json.c | |
| parent | 561317898c2c531bc9f91c8747cc0458b4c88e97 (diff) | |
| parent | fed80ee605df24c4fe70f09b77cb2551fdf47d79 (diff) | |
| download | php-git-223a62d69eeace864cb5deb45e3a56eb3ac3beaa.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix English and improve by Stas. Thanks :)
Update source docs
Revert "Update source docs"
Update source docs
Conflicts:
README.EXTENSIONS
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions