summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-01-26 17:21:33 -0800
committerStanislav Malyshev <stas@php.net>2014-01-26 17:21:33 -0800
commit473cd4d6a9c89d0c199bee579bae85b1e6365c65 (patch)
tree62796ab8df545941a8801df641f1fe7026046ac6 /ext/json/json.c
parent586f379b88e53752f56c37a5fa73b47533ef65a5 (diff)
parent223a62d69eeace864cb5deb45e3a56eb3ac3beaa (diff)
downloadphp-git-473cd4d6a9c89d0c199bee579bae85b1e6365c65.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Fix English and improve by Stas. Thanks :) Update source docs Revert "Update source docs" Update source docs
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions