summaryrefslogtreecommitdiff
path: root/ext/json/php_json_encoder.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-10-29 03:18:19 +0200
committerAnatol Belski <ab@php.net>2016-10-29 03:18:19 +0200
commit8e4ea7a188f1b7d4b4b0726296ff1f7506db43a1 (patch)
tree38f4b9b8e960945b46fe98075340eeb86411087b /ext/json/php_json_encoder.h
parent3f35078857df0474daba0812307576b2b47e6922 (diff)
parentddbcb2084aee71d1723b3ca39668010c1ba31124 (diff)
downloadphp-git-8e4ea7a188f1b7d4b4b0726296ff1f7506db43a1.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: fix test run with autogenerated ini
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions