summaryrefslogtreecommitdiff
path: root/ext/json/php_json.h
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2019-01-30 01:29:05 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2019-01-30 01:29:05 +0100
commit362d6ce834b17812e302ae568b44531e084ce734 (patch)
tree399a4a2d933032bd0b90ead12924f51c9519ad0c /ext/json/php_json.h
parent14684af0d0194199291cbdd528886941fdab7635 (diff)
parentcbc5a141f78f873be408e44a0658ea789b9cd365 (diff)
downloadphp-git-362d6ce834b17812e302ae568b44531e084ce734.tar.gz
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Prepare main branch for PHP 7.2.16
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions