summaryrefslogtreecommitdiff
path: root/ext/json/php_json_parser.h
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2017-10-15 13:31:30 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2017-10-15 13:35:59 +0200
commitde5f15ed4e20c48a98e17566b60979cdc355e820 (patch)
tree1215f322e677a2f27865da28b820c8c32443a9b8 /ext/json/php_json_parser.h
parent481a65a0283b130117e101d6b46a71b91d0dd227 (diff)
parentfd993b10455e61e209c2d0a5a3dfaec4baf6d116 (diff)
downloadphp-git-de5f15ed4e20c48a98e17566b60979cdc355e820.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1: Fixed bug #75365 (Enchant still reports version 1.1.0)
Diffstat (limited to 'ext/json/php_json_parser.h')
0 files changed, 0 insertions, 0 deletions