summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-10-20 15:25:01 +0200
committerAnatol Belski <ab@php.net>2017-10-20 15:25:01 +0200
commitae6d877f54e98bc13b018ca0e9c6f3f7b72249eb (patch)
tree1a3282b6f6d4e8ec04055c4d9a6877ec7041590d /ext/json/php_json.h
parent2f444640b4156208994c246015f45d3cbe8828a3 (diff)
parent7240d99838113af9f8f6db21b3b57ba2a7d23a0d (diff)
downloadphp-git-ae6d877f54e98bc13b018ca0e9c6f3f7b72249eb.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Fix version checks in tests
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions