summaryrefslogtreecommitdiff
path: root/ext/json/php_json_encoder.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-12-22 16:45:25 +0100
committerAnatol Belski <ab@php.net>2017-12-22 16:45:25 +0100
commit2252d8d730dca78d2434ba45b331188ea83b2314 (patch)
tree800ad45861540a060ce570ed3dc445946d774e10 /ext/json/php_json_encoder.h
parenta93445bf55ffe9a7cab6481ff488ad0c590d0eb6 (diff)
parent77b0e2fd3f5e76f12bdd4a66f64e553bc35cb37d (diff)
downloadphp-git-2252d8d730dca78d2434ba45b331188ea83b2314.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Fix wrong return value for fail case in set attribute handler in pdo_odbc
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions