]> granicus.if.org Git - php/commit
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)
commit088905bf602ba83c42ac822641ff6f359ba9ba3d
tree153ed2e4190e7dc450b8171d00f8edd2849ac22a
parent0d5050225db58fdb3673feb15679c31882199808
parentf5e56cf9707a1be547cc29f568d6f60dbdbb1e4c
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #72668 (Spurious warning when exception is thrown in user defined function)
ext/sqlite3/sqlite3.c