summaryrefslogtreecommitdiff
path: root/ext/json/php_json_encoder.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-12-22 16:28:10 +0100
committerAnatol Belski <ab@php.net>2017-12-22 16:28:10 +0100
commita93445bf55ffe9a7cab6481ff488ad0c590d0eb6 (patch)
tree43183c941e05b3c078090213278f17ff0a8a90d8 /ext/json/php_json_encoder.h
parenta1810758d53c3f7d44912a614109c741d2de2cfb (diff)
parentd7cc1ce58fa639bda65d7ee6261f0e9e3f716e8d (diff)
downloadphp-git-a93445bf55ffe9a7cab6481ff488ad0c590d0eb6.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: pdo_odbc has no driver API for quoting, skip the test
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions