Merge branch 'PHP-7.2' into PHP-7.3
authorChristopher Jones <christopher.jones@oracle.com>
Fri, 7 Dec 2018 12:20:27 +0000 (23:20 +1100)
committerChristopher Jones <christopher.jones@oracle.com>
Fri, 7 Dec 2018 12:20:27 +0000 (23:20 +1100)
1  2 
ext/oci8/oci8.c
ext/oci8/oci8_lob.c
ext/oci8/oci8_statement.c
ext/oci8/php_oci8_int.h

diff --cc ext/oci8/oci8.c
Simple merge
Simple merge
Simple merge
Simple merge