]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorJohannes Schlüter <johannes@php.net>
Tue, 20 Feb 2018 22:33:01 +0000 (23:33 +0100)
committerJohannes Schlüter <johannes@php.net>
Tue, 20 Feb 2018 22:33:01 +0000 (23:33 +0100)
1  2 
ext/mysqlnd/mysqlnd_auth.c
ext/mysqlnd/mysqlnd_vio.c

Simple merge
Simple merge