summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2016-09-15 15:36:39 +0200
committerRemi Collet <remi@php.net>2016-09-15 15:36:39 +0200
commitdb795d4c0299abe6a26c43accf69ca918607b0fd (patch)
treefb62eecced02b3f9a2dc79532c69fe1cb4b58be4 /ext/json/json.c
parentf5abe9ff576d7efdfad3b8f757e071278e795ba8 (diff)
parentd2d77c028d78add62cde08cf294f9ffb62a5005b (diff)
downloadphp-git-db795d4c0299abe6a26c43accf69ca918607b0fd.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: fix test (32bits)
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions