summaryrefslogtreecommitdiff
path: root/ext/json/json.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-01-31 23:47:25 -0800
committerStanislav Malyshev <stas@php.net>2015-01-31 23:47:25 -0800
commitc5526291cedcb6b5c48d6f13cc7481f8eea9761a (patch)
treef39a385ea07e1e448f59bdaf66e6dcdcdc61c1d1 /ext/json/json.c
parent55d5811f85d8ef5934a430ef6d3604c942a4b2d3 (diff)
parente5e251b02309d046680e9190cfc688fab4e5670e (diff)
downloadphp-git-c5526291cedcb6b5c48d6f13cc7481f8eea9761a.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: fix group name handling
Diffstat (limited to 'ext/json/json.c')
0 files changed, 0 insertions, 0 deletions