diff options
author | Dmitry Stogov <dmitry@zend.com> | 2016-10-18 15:09:44 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2016-10-18 15:09:44 +0300 |
commit | c31d66b3fdab3c7ab8e71ef7e02f90421851a495 (patch) | |
tree | e0c9b178c90c31243c4c7d810ffc9fd0b63daacb /ext/json/json_scanner.c | |
parent | 689cf8b2666e0bc9dff5c9216fedbf491890d3da (diff) | |
parent | 7bd4e7208e26e3e441717c0f33a154a385764d06 (diff) | |
download | php-git-c31d66b3fdab3c7ab8e71ef7e02f90421851a495.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73337 (try/catch not working with two exceptions inside a same operation)
Revert "Fix bug #47890 #73215 uniqid() should use better random source"
Update NEWS
Diffstat (limited to 'ext/json/json_scanner.c')
0 files changed, 0 insertions, 0 deletions