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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.