summaryrefslogtreecommitdiff
path: root/ext/json/json_encoder.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-10-18 18:22:52 +0200
committerAnatol Belski <ab@php.net>2016-10-18 18:22:52 +0200
commit6d6616cc9dd1e6b19e6ac6054f7ee4098b785425 (patch)
tree2144163e5c95c385a6074a2006b3079b5a239470 /ext/json/json_encoder.c
parent58f3b9c0efd07791e8589493c597730d6c425f6e (diff)
parentb4371a42921e4099a6110763b707abea7ffc0f03 (diff)
downloadphp-git-6d6616cc9dd1e6b19e6ac6054f7ee4098b785425.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: sync NEWS
Diffstat (limited to 'ext/json/json_encoder.c')
0 files changed, 0 insertions, 0 deletions