summaryrefslogtreecommitdiff
path: root/ext/json/php_json_encoder.h
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2016-10-29 18:50:06 +0200
committerBob Weinand <bobwei9@hotmail.com>2016-10-29 18:50:06 +0200
commitbe6bf71274a4670d7c7f45142890eb0651359c64 (patch)
tree121ef49eb5a4a1f26c703b5c61de2f5ca743fca3 /ext/json/php_json_encoder.h
parent87cb91ea7c0c3b864042965b6b893a690df08df7 (diff)
parent36527eccbb793ef15f828ffa4261d9a862144f07 (diff)
downloadphp-git-be6bf71274a4670d7c7f45142890eb0651359c64.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions