summaryrefslogtreecommitdiff
path: root/ext/json/php_json_encoder.h
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2017-12-22 18:12:03 +0100
committerNikita Popov <nikita.ppv@gmail.com>2017-12-22 18:12:17 +0100
commit2c880037f57d1ed72a14bc0c25a56d9a272e5c9a (patch)
treeee07a19305333cb0310841d3b5244096fe1b4636 /ext/json/php_json_encoder.h
parent74e3da5c8c1e91e851ccb401b3573deef6a801f2 (diff)
parentec142f2c86c28b970aef631a5750f6a02b954089 (diff)
downloadphp-git-2c880037f57d1ed72a14bc0c25a56d9a272e5c9a.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