summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-10-21 17:24:42 +0200
committerAnatol Belski <ab@php.net>2017-10-21 17:24:42 +0200
commitbb0a15f4990d9b65b8288f840d1672bb05483b55 (patch)
tree10f73b57535852eac48e4405e2dff6f8bc74557b /ext/json/php_json.h
parentff1b1c27616e0681ab5447f362a15fa3fc53ffa9 (diff)
parente986f71527522467e7265b18242a42d3f7fc69e5 (diff)
downloadphp-git-bb0a15f4990d9b65b8288f840d1672bb05483b55.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: With ICU 58+, set the default restriction level to high
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions