]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6997b87 304bff9)
Merge branch 'PHP-5.5' into PHP-5.6
authorAdam Harvey <aharvey@php.net>
Sun, 10 Nov 2013 21:15:12 +0000 (16:15 -0500)
committerAdam Harvey <aharvey@php.net>
Sun, 10 Nov 2013 21:15:12 +0000 (16:15 -0500)
* PHP-5.5:
  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")


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