]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a43e3f 197470b)
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Fri, 6 May 2016 12:25:43 +0000 (20:25 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 6 May 2016 12:25:43 +0000 (20:25 +0800)
* PHP-7.0:
  Revert "Fixed bug #72170 (JsonSerializable may inc apply count without dec it)"

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

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