]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 19 Jan 2015 18:05:57 +0000 (10:05 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 19 Jan 2015 18:05:57 +0000 (10:05 -0800)
commit1fdd558e39beeeca9166eef4311b98f1926f642b
tree8e0ffff2fdfa5ff5debb65bed15e5fdee5ed6d9f
parent1b53a99fbf847ce346e24bb2f25a0ca2298b94a1
parentac7cfad3b54b04b7ff2d0e4bfd26e8b61d233613
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #50224 where float without decimals were converted to integer
  Updated NEWS for #68371
ext/json/json.c
ext/json/php_json.h