]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorChristoph M. Becker <cmb@php.net>
Mon, 25 Jul 2016 15:15:10 +0000 (17:15 +0200)
committerChristoph M. Becker <cmb@php.net>
Mon, 25 Jul 2016 15:15:10 +0000 (17:15 +0200)
1  2 
ext/sqlite3/sqlite3.c

Simple merge