]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Mon, 25 Jul 2016 12:28:57 +0000 (20:28 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 25 Jul 2016 12:28:57 +0000 (20:28 +0800)
* PHP-7.0:
  Fixed bug #72668 (Spurious warning when exception is thrown in user defined function)

1  2 
ext/sqlite3/sqlite3.c

Simple merge