summaryrefslogtreecommitdiff
path: root/ext/json/json_encoder.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-10-18 19:43:57 +0200
committerAnatol Belski <ab@php.net>2016-10-18 19:43:57 +0200
commit744ea9721e517741cf2bca9bc10b0991e5cf1fdb (patch)
treed12f9024e449caecdc0127b3a5a1308c88194100 /ext/json/json_encoder.c
parent671f647739cb319447eba1f4d8451eea6bfd4cba (diff)
parentb754bc797cf92f4b2617f4761e4fbb33d00f1202 (diff)
downloadphp-git-744ea9721e517741cf2bca9bc10b0991e5cf1fdb.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: update NEWS
Diffstat (limited to 'ext/json/json_encoder.c')
0 files changed, 0 insertions, 0 deletions