summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-10-20 13:57:44 +0200
committerAnatol Belski <ab@php.net>2017-10-20 13:57:44 +0200
commite2afa00b4cc751588d9cb386735ae544812dc482 (patch)
treea39e9f6bd614785d0a821b9df4bd35786b47763c /ext/json/php_json.h
parent26473523b02d076e3108084a745ecd2ea4b8f61f (diff)
parent877e0b04bc476859e21d48ae349c2a994987fdb0 (diff)
downloadphp-git-e2afa00b4cc751588d9cb386735ae544812dc482.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Sync some tests for compat with ICU 58.1+
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions