]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f9f378 7c9209a)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 01:56:26 +0000 (18:56 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 01:56:26 +0000 (18:56 -0700)
* PHP-5.6:
  Fix #66021 (Blank line inside empty array/object)

1  2 
ext/json/json.c patch | diff1 | diff2 | blob | history

diff --cc ext/json/json.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.