diff options
author | Anatol Belski <ab@php.net> | 2017-12-22 16:28:10 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2017-12-22 16:28:10 +0100 |
commit | a93445bf55ffe9a7cab6481ff488ad0c590d0eb6 (patch) | |
tree | 43183c941e05b3c078090213278f17ff0a8a90d8 /ext/json/php_json_encoder.h | |
parent | a1810758d53c3f7d44912a614109c741d2de2cfb (diff) | |
parent | d7cc1ce58fa639bda65d7ee6261f0e9e3f716e8d (diff) | |
download | php-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