]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c3b4dc c85f12e)
Merge branch 'PHP-5.5' into PHP-5.6
authorJulien Pauli <jpauli@php.net>
Wed, 4 Feb 2015 11:48:57 +0000 (12:48 +0100)
committerJulien Pauli <jpauli@php.net>
Wed, 4 Feb 2015 11:48:57 +0000 (12:48 +0100)
* PHP-5.5:
  Revert "json_decode() should generate a syntax error when given ""."
  Update NEWS

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.