]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fac240b 1205a6c)
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Sun, 10 Nov 2013 21:16:38 +0000 (16:16 -0500)
committerAdam Harvey <aharvey@php.net>
Sun, 10 Nov 2013 21:16:38 +0000 (16:16 -0500)
commit91cb0877275ed56715afcc8fb5e0cf85c591f049
tree6cbc7cb1d3bc546bd834e0539e5d5547af8ffc42tree | snapshot
parentfac240b5d1363305acb3c40a814ab397e842c966commit | diff
parent1205a6c7dc1e5123279e1cbb946dfbc538d8a976commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
ext/json/json.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.