summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-10-21 10:52:48 +0200
committerAnatol Belski <ab@php.net>2017-10-21 10:52:48 +0200
commit839b3d167790bb3e64b75ff4008f73e5355a2638 (patch)
tree8ccac5b21fd31d3dfca63d51e5f9e4dbed5e0408 /ext/json/php_json.h
parent3eb7ea55ae89337c96ab9b5b32b0ab5da1348f73 (diff)
parentf588a02463b2f853624344448fb715a5185cbdf3 (diff)
downloadphp-git-839b3d167790bb3e64b75ff4008f73e5355a2638.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Disable AppVeyor cache to unlock build
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions