summaryrefslogtreecommitdiff
path: root/ext/json/php_json_encoder.h
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2016-10-18 14:31:49 +0200
committerBob Weinand <bobwei9@hotmail.com>2016-10-18 14:31:49 +0200
commit58f3b9c0efd07791e8589493c597730d6c425f6e (patch)
tree2144163e5c95c385a6074a2006b3079b5a239470 /ext/json/php_json_encoder.h
parentc31d66b3fdab3c7ab8e71ef7e02f90421851a495 (diff)
parent8b177f6a2a2782107461d7153385857872e2f4b9 (diff)
downloadphp-git-58f3b9c0efd07791e8589493c597730d6c425f6e.tar.gz
Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions