]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorChristopher Jones <christopher.jones@oracle.com>
Thu, 4 Aug 2016 07:02:08 +0000 (17:02 +1000)
committerChristopher Jones <christopher.jones@oracle.com>
Thu, 4 Aug 2016 07:02:08 +0000 (17:02 +1000)
1  2 
ext/oci8/oci8.c
ext/standard/ftp_fopen_wrapper.c

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