summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-08-29 13:43:08 +0200
committerAnatol Belski <ab@php.net>2016-08-29 13:43:08 +0200
commit0e709fe42d781209e955cf54d34e12361a784680 (patch)
treebd062b494c6144c16834afe7e0754760a6a66d2a /ext/json/json.c
parentb5bab0fce89f2f4dd3e04bce60dcd2bcd85f6a03 (diff)
parenteac7f4b6708ba1ff5bb2e76cc6d275419d50e589 (diff)
downloadphp-git-0e709fe42d781209e955cf54d34e12361a784680.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: fix dealloc mismatch
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions