summaryrefslogtreecommitdiff
path: root/ext/json/php_json_parser.h
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-13 15:16:15 +0200
committerPeter Kokot <peterkokot@gmail.com>2018-10-13 15:16:15 +0200
commit3764bd7997cfdf19a18fdd475efa5ca085153a8f (patch)
tree0bf1980fc391f676dfc827e32318a63b1959fab6 /ext/json/php_json_parser.h
parent3362620b5f8716ce480b6f12269596c2d2351a52 (diff)
parent102cf75eebb88bdad9317939741cbe411d2f5ad8 (diff)
downloadphp-git-3764bd7997cfdf19a18fdd475efa5ca085153a8f.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Fix failing ext/zlib/tests due to whitespace
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions