summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorJakub Zelenka <bukka@php.net>2016-08-29 15:01:00 +0100
committerJakub Zelenka <bukka@php.net>2016-08-29 15:01:00 +0100
commitab65665a0ec5a3c5da8a9ad8c7f209b5038ce14a (patch)
treee5f277594d91668713c04ae4697edcde23bff296 /ext/json/php_json.h
parent50c5d13d26b5cd471c7be5db81cf5d57ff957437 (diff)
parentf5b4aae7acad9ad86bd00c0209af28b273e5d82e (diff)
downloadphp-git-ab65665a0ec5a3c5da8a9ad8c7f209b5038ce14a.tar.gz
Merge branch 'json_encode_fail_return' into PHP-7.1
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions