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