projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit93315c4e1d514c2824bbadc23337603314db8f63
treec46d4a39c9c6583113c19cbfc6af5f5ca3750d8btree | snapshot
parent4c3b4dc74af13eec25ad460551df8fd4b3984269commit | diff
parentc85f12e3aca8d1da64504018e421a766ab66e574commit | diff
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Revert "json_decode() should generate a syntax error when given ""."
  Update NEWS
ext/json/json.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.