summaryrefslogtreecommitdiff
path: root/ext/json/php_json_encoder.h
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2017-12-22 18:01:16 +0100
committerNikita Popov <nikita.ppv@gmail.com>2017-12-22 18:01:30 +0100
commit74e3da5c8c1e91e851ccb401b3573deef6a801f2 (patch)
tree0917679987c7d69b439095b60ea0ece69e656441 /ext/json/php_json_encoder.h
parent3237336985dd7c262c51dbb9e8b4b3432982c04e (diff)
parentccb113c3e5964ef2d2e5b4ae3e67d61702db9bfc (diff)
downloadphp-git-74e3da5c8c1e91e851ccb401b3573deef6a801f2.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions