diff options
author | Anatol Belski <ab@php.net> | 2016-10-29 17:57:33 +0200 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2016-10-29 17:57:33 +0200 |
commit | 87cb91ea7c0c3b864042965b6b893a690df08df7 (patch) | |
tree | 274e10a1a2107f0b4fd989da83051259ea7a08e7 /ext/json/php_json_encoder.h | |
parent | e6b7e6081e195876968f420108c973ba9282c78d (diff) | |
parent | c7ec36d4fa4c70fc5bf4061efad74c55376041bb (diff) | |
download | php-git-87cb91ea7c0c3b864042965b6b893a690df08df7.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix condition
Diffstat (limited to 'ext/json/php_json_encoder.h')
0 files changed, 0 insertions, 0 deletions