summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorYasuo Ohgaki <yohgaki@php.net>2015-02-02 18:41:25 +0900
committerYasuo Ohgaki <yohgaki@php.net>2015-02-02 18:41:25 +0900
commitc7eea5a79b684469020e66ce8a2999aaab54f875 (patch)
tree583f349c2e1505f59c63a9ab9f01fb0ec311b0cd /ext/json/json.c
parent79c9dc75de490430a81ecb9134c2c79b3d8fc0a1 (diff)
parent675a12bbcfa0015198fb612b6850ad99c2e6977e (diff)
downloadphp-git-c7eea5a79b684469020e66ce8a2999aaab54f875.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Add test for bug #61470. It is already fixed.
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions