summaryrefslogtreecommitdiff
path: root/ext/json/php_json_encoder.h
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2017-12-22 17:49:20 +0100
committerNikita Popov <nikita.ppv@gmail.com>2017-12-22 17:50:04 +0100
commit3237336985dd7c262c51dbb9e8b4b3432982c04e (patch)
treeaae24f9c7de08eaaaffcfa4c28d41f709b36b933 /ext/json/php_json_encoder.h
parent2252d8d730dca78d2434ba45b331188ea83b2314 (diff)
parent024637378827ff03ccfb6b903c9d9b968d30af8d (diff)
downloadphp-git-3237336985dd7c262c51dbb9e8b4b3432982c04e.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