]> granicus.if.org Git - php/commit
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)
commitdee113ba4a8a6ea0b39980ca907c9bae2ed112c5
tree91a04bd3ce60c7bffb6d1ba226bf5f284efb07d2
parentef058b7cb52fe845b1a4f69240324bd7f6b04575
parent93315c4e1d514c2824bbadc23337603314db8f63
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "json_decode() should generate a syntax error when given ""."
  Update NEWS